diff --git a/app/src/common/shared/org/mozilla/vrbrowser/search/SearchEngine.java b/app/src/common/shared/org/mozilla/vrbrowser/search/SearchEngine.java
index bd4df009d..61b7d8636 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/search/SearchEngine.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/search/SearchEngine.java
@@ -7,6 +7,9 @@
 import org.mozilla.vrbrowser.SessionStore;
 import org.mozilla.vrbrowser.SettingsStore;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
 public class SearchEngine implements GeolocationTask.GeolocationTaskDelegate {
 
     private static final String LOGTAG = "VRB";
@@ -87,6 +90,12 @@ private SearchEngine(@NonNull Context aContext) {
     }
 
     public String getSearchURL(String aQuery) {
+        try {
+            aQuery = URLEncoder.encode(aQuery, "UTF-8");
+
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
         return mEngine.getSearchQuery(mContext, aQuery);
     }
     public String getURLResource() {
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/NavigationURLBar.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/NavigationURLBar.java
index b87a7437f..fabf3bc00 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/NavigationURLBar.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/NavigationURLBar.java
@@ -26,8 +26,10 @@
 import org.mozilla.vrbrowser.search.SearchEngine;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
 
+import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URL;
+import java.net.URLDecoder;
 import java.util.regex.Pattern;
 
 public class NavigationURLBar extends FrameLayout {
@@ -120,6 +122,12 @@ public void setURL(String aURL) {
 
         int index = -1;
         if (aURL != null) {
+            try {
+                aURL = URLDecoder.decode(aURL, "UTF-8");
+
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
             if (aURL.startsWith("jar:"))
                 return;
             else if (aURL.startsWith("resource:") || SessionStore.get().isHomeUri(aURL))
diff --git a/app/src/main/res/xml/keyboard_symbols.xml b/app/src/main/res/xml/keyboard_symbols.xml
index fc9fbeeb3..65c3d4072 100644
--- a/app/src/main/res/xml/keyboard_symbols.xml
+++ b/app/src/main/res/xml/keyboard_symbols.xml
@@ -19,7 +19,7 @@
     </Row>
 
     <Row>
-        <Key android:codes="45" android:keyLabel="-" android:keyEdgeFlags="left" android:horizontalGap="@dimen/keyboard_left_margin"/>
+        <Key android:codes="45" android:keyLabel="-" android:popupCharacters="-—" android:popupKeyboard="@xml/keyboard_popup" android:keyEdgeFlags="left" android:horizontalGap="@dimen/keyboard_left_margin"/>
         <Key android:codes="39" android:keyLabel="\'"/>
         <Key android:codes="58" android:keyLabel=":"/>
         <Key android:codes="59" android:keyLabel=";"/>
@@ -41,7 +41,7 @@
         <Key android:codes="96" android:keyLabel="`"/>
         <Key android:codes="63" android:keyLabel="\?"/>
         <Key android:codes="46" android:keyLabel="."/>
-        <Key android:codes="47" android:keyLabel="/" />
+        <Key android:codes="92" android:keyLabel="\\" />
         <Key android:codes="-10" android:keyLabel="#+" android:keyEdgeFlags="right"/>
     </Row>