diff --git a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
index 32f324aea9..09c2f6fa76 100644
--- a/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
+++ b/interface/resources/qml/hifi/commerce/checkout/Checkout.qml
@@ -892,6 +892,10 @@ Rectangle {
         } else {
             root.activeView = "checkoutSuccess";
         }
+        root.balanceReceived = false;
+        root.purchasesReceived = false;
+        commerce.inventory();
+        commerce.balance();
     }
 
     //
diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
index 420b51ba15..cc316a70e9 100644
--- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
+++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml
@@ -39,7 +39,7 @@ Item {
                 sendToParent({method: "needsLogIn"});
             } else if (walletStatus === 3) {
                 commerce.getSecurityImage();
-            } else {
+            } else if (walletStatus > 3) {
                 console.log("ERROR in EmulatedMarketplaceHeader.qml: Unknown wallet status: " + walletStatus);
             }
         }
diff --git a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
index 5bd88ba790..8d5d9f97de 100644
--- a/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
+++ b/interface/resources/qml/hifi/commerce/wallet/PassphraseModal.qml
@@ -197,6 +197,8 @@ Item {
             height: 50;
             echoMode: TextInput.Password;
             placeholderText: "passphrase";
+            activeFocusOnPress: true;
+            activeFocusOnTab: true;
 
             onFocusChanged: {
                 root.keyboardRaised = focus;
@@ -206,8 +208,8 @@ Item {
                 anchors.fill: parent;
 
                 onClicked: {
-                    parent.focus = true;
                     root.keyboardRaised = true;
+                    mouse.accepted = false;
                 }
             }