diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java
index 1a07c6b4f..8334edd60 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/KeyboardWidget.java
@@ -751,7 +751,7 @@ private void handleLanguageChange(KeyboardInterface aKeyboard) {
     }
 
     private void handleDomainChange(KeyboardSelectorView.Item aItem) {
-        handleText(aItem.title);
+        handleText(aItem.title, true);
 
         disableShift(getSymbolsKeyboard());
         handleShift(false);
@@ -829,11 +829,15 @@ private void handleKey(int primaryCode, int[] keyCodes) {
     }
 
     private void handleText(String aText) {
+        handleText(aText, false);
+    }
+
+    private void handleText(String aText, boolean skipCase) {
         if (mFocusedView == null || mInputConnection == null) {
             return;
         }
 
-        if (mKeyboardView.isShifted()) {
+        if (mKeyboardView.isShifted() && !skipCase) {
             aText = aText.toUpperCase();
         }