diff --git a/indra/newview/llgroupactions.cpp b/indra/newview/llgroupactions.cpp
index 9ce83cf58a..fd91689d17 100644
--- a/indra/newview/llgroupactions.cpp
+++ b/indra/newview/llgroupactions.cpp
@@ -451,9 +451,16 @@ void LLGroupActions::show(const LLUUID& group_id)
 		}
 	}
 
-	if (floater && floater->isMinimized())
+	if (floater)
 	{
-		floater->setMinimized(FALSE);
+		if (floater->isMinimized())
+		{
+			floater->setMinimized(FALSE);
+		}
+		if (!floater->hasFocus())
+		{
+			floater->setFocus(TRUE);
+		}
 	}
 	// </FS:Ansariel>
 }