1 files changed, 5 insertions, 2 deletions
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
index a9e983fe75..181137d274 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Components.Docking/DockBarItem.cs
@@ -169,6 +169,9 @@ namespace MonoDevelop.Components.Docking
 				lastFrameSize = args.Allocation.Size;
 				if (autoShowFrame != null)
 					bar.Frame.UpdateSize (bar, autoShowFrame);
+
+				UnscheduleAutoHide ();
+				AutoHide (false);
 			}
 		}
 		
@@ -301,7 +304,7 @@ namespace MonoDevelop.Components.Docking
 		{
 			UnscheduleAutoShow ();
 			if (autoShowFrame != null) {
-				size = autoShowFrame.Size;
+				size = autoShowFrame.PadSize;
 				hiddenFrame = autoShowFrame;
 				autoShowFrame.Hidden += delegate {
 					hiddenFrame = null;
@@ -344,7 +347,7 @@ namespace MonoDevelop.Components.Docking
 					if (it.ShowingContextMemu)
 						return true;
 					// Don't hide the item if it has the focus. Try again later.
-					if (it.Widget.FocusChild != null && !force)
+					if (it.Widget.FocusChild != null && !force && ((Gtk.Window)autoShowFrame.Toplevel).HasToplevelFocus)
 						return true;
 					// Don't hide the item if the mouse pointer is still inside the window. Try again later.
 					int px, py;