diff --git a/IDE/src/ui/SourceViewPanel.bf b/IDE/src/ui/SourceViewPanel.bf
index c0201dd0..dcefd854 100644
--- a/IDE/src/ui/SourceViewPanel.bf
+++ b/IDE/src/ui/SourceViewPanel.bf
@@ -3579,7 +3579,8 @@ namespace IDE.ui
 
             if (mOldVersionPanel != null)
             {
-                mEditWidget.mVisible = true;
+				if (mEditWidget != null)
+                	mEditWidget.mVisible = true;
                 if (mOldVersionPanel.mParent != null)
                     mOldVersionPanel.RemoveSelf();
                 mOldVersionPanel.Dispose();
@@ -3587,8 +3588,10 @@ namespace IDE.ui
 				//delete mOldVersionPanel;
                 mOldVersionPanel = null;
 				if (mWidgetWindow != null)
+				{
 					FocusEdit();
-				ResizeComponents();
+					ResizeComponents();
+				}
             }
         }