diff --git a/res/menu/text_secure_normal.xml b/res/menu/text_secure_normal.xml
index 55acd399e..1d75e1ddc 100644
--- a/res/menu/text_secure_normal.xml
+++ b/res/menu/text_secure_normal.xml
@@ -17,7 +17,9 @@
           android:id="@+id/menu_deaddrop" />
 
     <item android:title="@string/menu_show_global_map"
-          android:id="@+id/menu_global_map" />
+        android:id="@+id/menu_global_map"
+        android:visible="false"
+        />
 
     <item android:title="@string/menu_settings"
           android:id="@+id/menu_settings" />
diff --git a/src/org/thoughtcrime/securesms/ConversationListActivity.java b/src/org/thoughtcrime/securesms/ConversationListActivity.java
index 396a88ca4..bf4e69f99 100644
--- a/src/org/thoughtcrime/securesms/ConversationListActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationListActivity.java
@@ -92,6 +92,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     menu.clear();
 
     inflater.inflate(R.menu.text_secure_normal, menu);
+    MenuItem item = menu.findItem(R.id.menu_global_map);
+    if (Prefs.isLocationStreamingEnabled(this)) {
+      item.setVisible(true);
+    }
 
     if (!Prefs.isLocationStreamingEnabled(this)) {
       menu.findItem(R.id.menu_global_map).setVisible(false);