diff --git a/src/chrome/LocationsButton.tsx b/src/chrome/LocationsButton.tsx
index e2e45d467..f5c4c9c46 100644
--- a/src/chrome/LocationsButton.tsx
+++ b/src/chrome/LocationsButton.tsx
@@ -19,6 +19,7 @@ import {PersistedState as NavPluginState} from '../plugins/navigation/types';
 import BaseDevice from '../devices/BaseDevice';
 import {State as PluginState} from 'src/reducers/pluginStates';
 import {platform} from 'os';
+import {getPluginKey} from '../utils/pluginUtils';
 
 type State = {
   bookmarks: Array<Bookmark>;
@@ -153,10 +154,12 @@ class LocationsButton extends Component<Props, State> {
   }
 }
 
-const mapStateFromPluginStatesToProps = (pluginStates: PluginState) => {
-  const pluginKey = Object.keys(pluginStates).find(key =>
-    /#Navigation$/.test(key),
-  );
+const mapStateFromPluginStatesToProps = (
+  pluginStates: PluginState,
+  selectedDevice: BaseDevice | null,
+  selectedApp: string | null,
+) => {
+  const pluginKey = getPluginKey(selectedApp, selectedDevice, 'Navigation');
   let currentURI: string | undefined;
   if (pluginKey) {
     const navPluginState = pluginStates[pluginKey] as
@@ -170,8 +173,12 @@ const mapStateFromPluginStatesToProps = (pluginStates: PluginState) => {
 };
 
 export default connect<StateFromProps, DispatchFromProps, OwnProps, Store>(
-  ({connections: {selectedDevice}, pluginStates}) => ({
+  ({connections: {selectedDevice, selectedApp}, pluginStates}) => ({
     selectedDevice,
-    ...mapStateFromPluginStatesToProps(pluginStates),
+    ...mapStateFromPluginStatesToProps(
+      pluginStates,
+      selectedDevice,
+      selectedApp,
+    ),
   }),
 )(LocationsButton);