diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp
index 266d497bad..10e26b08a2 100755
--- a/indra/llui/llfloater.cpp
+++ b/indra/llui/llfloater.cpp
@@ -1399,6 +1399,9 @@ void LLFloater::setMinimized(BOOL minimize)
 
 		// Reshape *after* setting mMinimized
 		reshape( mExpandedRect.getWidth(), mExpandedRect.getHeight(), TRUE );
+
+		// <FS:Ansariel> FIRE-7530: Make sure, an un-minimized floater goes to the front
+		setFrontmost();
 	}
 
 	make_ui_sound("UISndWindowClose");