diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 403c612c4..1fc7cdf9e 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -674,6 +674,19 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>LiruGridInTitle</key>
+    <map>
+      <key>Comment</key>
+      <string>Show grid name in the viewer window title (takes effect upon next login)</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <boolean>0</boolean>
+      <key>IsCOA</key>
+      <integer>1</integer>
+    </map>
     <key>LiruGroupNoticeTimes</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 53f438645..77d6b9e6e 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -1551,6 +1551,7 @@ bool idle_startup()
 				{
 					name += " " + lastname;
 				}
+				if (gSavedSettings.getBOOL("LiruGridInTitle")) gWindowTitle += "- " + gHippoGridManager->getCurrentGrid()->getGridName() + " ";
 				gViewerWindow->getWindow()->setTitle(gWindowTitle += "- " + name);
 				// Pass the user information to the voice chat server interface.
 				LLVoiceClient::getInstance()->userAuthorized(name, gAgentID);