diff -r 4d9106153407 -r 23212145a4c6 indra/llui/llfloater.cpp
--- a/indra/llui/llfloater.cpp	Thu Jun 21 16:44:04 2012 -0400
+++ b/indra/llui/llfloater.cpp	Mon Jun 25 14:41:45 2012 +0200
@@ -748,6 +748,9 @@
 					dependee->setFocus(TRUE);
 				}
 			}
+			// With focus, treat the closeFloater- call like a click on the close-button
+                        // and close gear- and contextmenus.
+			LLMenuGL::sMenuContainer->hideMenus();
 		}
 
 		dirtyRect();
diff -r 4d9106153407 -r 23212145a4c6 indra/llui/lltoggleablemenu.cpp
--- a/indra/llui/lltoggleablemenu.cpp	Thu Jun 21 16:44:04 2012 -0400
+++ b/indra/llui/lltoggleablemenu.cpp	Mon Jun 25 14:41:45 2012 +0200
@@ -57,7 +57,8 @@
 	S32 x,y;
 	LLUI::getMousePositionLocal(LLUI::getRootView(), &x, &y);
 
-	if (!curVisibilityIn && mButtonRect.pointInRect(x, y))
+	// If getMouseCapture returns false, the VisibilityChange was triggered via keyboard shortcut.
+	if (!curVisibilityIn && mButtonRect.pointInRect(x, y) && gFocusMgr.getMouseCapture())
 	{
 		mClosedByButtonClick = true;
 	}