diff --git a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
index d29ba5c30b..e3440b6f7d 100644
--- a/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
+++ b/src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
@@ -234,10 +234,12 @@ namespace ICSharpCode.SharpDevelop.Gui
 				try {
 					IWorkbenchWindow activeWindow = this.ActiveWorkbenchWindow;
 					dockPanel.ActiveDocumentChanged -= new EventHandler(ActiveMdiChanged);
+					dockPanel.ActiveContentChanged -= new EventHandler(ActiveContentChanged);
 					
 					DetachPadContents(false);
 					DetachViewContents(false);
 					dockPanel.ActiveDocumentChanged += new EventHandler(ActiveMdiChanged);
+					dockPanel.ActiveContentChanged += new EventHandler(ActiveContentChanged);
 					
 					LoadLayoutConfiguration();
 					ShowPads();
diff --git a/src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs b/src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs
index 66e2025208..d1aa7ae2b5 100644
--- a/src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs
+++ b/src/Main/Base/Project/Src/Internal/Doozers/PadDescriptor.cs
@@ -149,6 +149,7 @@ namespace ICSharpCode.SharpDevelop
 				padContentCreated = true;
 				try {
 					if (addIn != null) {
+						LoggingService.Debug("Creating pad " + Class + "...");
 						padContent = (IPadContent)addIn.CreateObject(Class);
 					} else {
 						padContent = (IPadContent)Activator.CreateInstance(padType);