diff --git a/indra/newview/lltoolbarview.cpp b/indra/newview/lltoolbarview.cpp
index adc08e069d..9f29b4c095 100755
--- a/indra/newview/lltoolbarview.cpp
+++ b/indra/newview/lltoolbarview.cpp
@@ -604,6 +604,8 @@ void LLToolBarView::onToolBarButtonRemoved(LLView* button)
 		FloaterQuickPrefs* quickprefs_floater = LLFloaterReg::getTypedInstance<FloaterQuickPrefs>("quickprefs");
 		if (quickprefs_floater && quickprefs_floater->isShown())
 		{
+			quickprefs_floater->setUseTongue(false);
+			quickprefs_floater->setDocked(false, false);
 			quickprefs_floater->setCanDock(false);
 			LLDockControl* dock_control = quickprefs_floater->getDockControl();
 			dock_control->setDock(NULL);
diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp
index 7a4e910c45..1b9d0efe7f 100644
--- a/indra/newview/quickprefs.cpp
+++ b/indra/newview/quickprefs.cpp
@@ -1915,7 +1915,8 @@ void FloaterQuickPrefs::dockToToolbarButton()
 	else
 	{
 		setUseTongue(false);
-		setDockControl(NULL);
+		setDocked(false, false);
 		setCanDock(false);
+		setDockControl(NULL);
 	}
 }