diff --git a/interface/resources/qml/hifi/Feed.qml b/interface/resources/qml/hifi/Feed.qml
index 68aab2fdd2..718ebc9331 100644
--- a/interface/resources/qml/hifi/Feed.qml
+++ b/interface/resources/qml/hifi/Feed.qml
@@ -189,4 +189,14 @@ Column {
             }
         }
     }
+    function isStandalone(address) {
+        var lowerAddress = address.toLowerCase();
+
+        for (var i=0; i < suggestions.count; i++) {
+            if (suggestions.get(i).place_name.toLowerCase() === lowerAddress) {
+                return suggestions.get(i).standalone_optimized;
+            }
+        }
+        return false;
+    }
 }
diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
index 311d20955b..4edae017d1 100644
--- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
+++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml
@@ -230,7 +230,7 @@ StackView {
                     updateLocationText(text.length > 0);
                 }
                 onAccepted: {
-                    toggleOrGo();
+                    toggleOrGo(addressLine.text, false, places.isStandalone(addressLine.text));
                 }
 
                 // unfortunately TextField from Quick Controls 2 disallow customization of placeHolderText color without creation of new style