diff --git a/src/Main/Base/Project/Src/Gui/FormLocationHelper.cs b/src/Main/Base/Project/Src/Gui/FormLocationHelper.cs
index f0c6494fb5..f2378bd8fd 100644
--- a/src/Main/Base/Project/Src/Gui/FormLocationHelper.cs
+++ b/src/Main/Base/Project/Src/Gui/FormLocationHelper.cs
@@ -28,7 +28,9 @@ namespace ICSharpCode.SharpDevelop.Gui
 			}
 			form.Closing += delegate {
 				if (isResizable) {
-					PropertyService.Set(propertyName, form.Bounds);
+					if (form.WindowState == FormWindowState.Normal) {
+						PropertyService.Set(propertyName, form.Bounds);
+					}
 				} else {
 					PropertyService.Set(propertyName, form.Location);
 				}
diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
index 9df2344f9f..2fe41cf128 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceWindow.cs
@@ -328,7 +328,6 @@ namespace ICSharpCode.SharpDevelop.Gui
 			if (e.Action == TabControlAction.Selected && e.TabPageIndex >= 0) {
 				IBaseViewContent secondaryViewContent = GetSubViewContent(e.TabPageIndex);
 				if (secondaryViewContent != null) {
-					secondaryViewContent.Deselected();
 					secondaryViewContent.SwitchedTo();
 					secondaryViewContent.Selected();
 				}