diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index d28c987414..1825797159 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -134,12 +134,15 @@ void LLFloaterFixedEnvironment::onClose(bool app_quitting)
 {
     doCloseInventoryFloater(app_quitting);
 
-    LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
-    LLEnvironment::instance().setCurrentEnvironmentSelection(LLEnvironment::ENV_LOCAL);
-    LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_EDIT);
+    if (!app_quitting)
+    {
+        LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL);
+        LLEnvironment::instance().setCurrentEnvironmentSelection(LLEnvironment::ENV_LOCAL);
+        LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_EDIT);
 
-    mSettings.reset();
-    syncronizeTabs();
+        mSettings.reset();
+        syncronizeTabs();
+    }
 }
 
 void LLFloaterFixedEnvironment::refresh()