1 files changed, 7 insertions, 1 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
index 02f788d000..913edeebc1 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockItem.cs
@@ -327,7 +327,12 @@ namespace MonoDevelop.Components.Docking
 		{
 			if (dockBarItem != null)
 				dockBarItem.Present (Status == DockItemStatus.AutoHide || giveFocus);
-			else
+			else if (floatingWindow != null) {
+				if (giveFocus)
+					floatingWindow.Present ();
+				else
+					floatingWindow.Show ();
+			} else
 				frame.Present (this, Status == DockItemStatus.AutoHide || giveFocus);
 		}
 
@@ -412,6 +417,7 @@ namespace MonoDevelop.Components.Docking
 				SetRegionStyle (frame.GetRegionStyleForItem (this));
 
 				floatingWindow = new DockFloatingWindow ((Window)frame.Toplevel, GetWindowTitle ());
+				Ide.IdeApp.CommandService.RegisterTopWindow (floatingWindow);
 
 				VBox box = new VBox ();
 				box.Show ();