diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
index d2c94a7f9..cc5c91a42 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/WindowWidget.java
@@ -575,7 +575,6 @@ public boolean onGenericMotionEvent(MotionEvent aEvent) {
     }
 
     private void setPrivateBrowsingEnabled(boolean isEnabled) {
-        // TODO: Fade in/out the browser window. Waiting for https://github.com/MozillaReality/FirefoxReality/issues/77
     }
 
     public void setNoInternetToastVisible(boolean aVisible) {
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ConfirmPromptWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ConfirmPromptWidget.java
index 4f7df8c99..301bedaec 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ConfirmPromptWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/prompts/ConfirmPromptWidget.java
@@ -96,7 +96,7 @@ public void setButtons(String[] btnMsg) {
         // Returning 0 should be Ok but is in fact Cancel.
         if (btnMsg[POSITIVE] != null) {
             mButtons[POSITIVE].setText(btnMsg[POSITIVE]);
-            mButtons[POSITIVE].setTag(NEGATIVE);
+            mButtons[POSITIVE].setTag(POSITIVE);
             mButtons[POSITIVE].setVisibility(VISIBLE);
         }
         if (btnMsg[NEUTRAL] != null) {
@@ -106,7 +106,7 @@ public void setButtons(String[] btnMsg) {
         }
         if (btnMsg[NEGATIVE] != null) {
             mButtons[NEGATIVE].setText(btnMsg[NEGATIVE]);
-            mButtons[NEGATIVE].setTag(POSITIVE);
+            mButtons[NEGATIVE].setTag(NEGATIVE);
             mButtons[NEGATIVE].setVisibility(VISIBLE);
         }
     }