diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
index 140cc5513..e0c2cb2e0 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/NavigationBarWidget.java
@@ -973,7 +973,7 @@ public void onURLSelectionAction(EditText aURLEdit, float centerX, SelectionActi
 
     @Override
     public void onPopUpButtonClicked() {
-        toggleQuickPermission(mBinding.navigationBarNavigation.urlBar.getWebXRButton(),
+        toggleQuickPermission(mBinding.navigationBarNavigation.urlBar.getPopUpButton(),
                 SitePermission.SITE_PERMISSION_POPUP,
                 !mViewModel.getIsPopUpBlocked().getValue().get());
     }
@@ -994,7 +994,7 @@ public void onTrackingButtonClicked() {
 
     @Override
     public void onDrmButtonClicked() {
-        toggleQuickPermission(mBinding.navigationBarNavigation.urlBar.getTrackingButton(),
+        toggleQuickPermission(mBinding.navigationBarNavigation.urlBar.getDrmButton(),
                 SitePermission.SITE_PERMISSION_DRM,
                 !SettingsStore.getInstance(getContext()).isDrmContentPlaybackEnabled());
     }
@@ -1246,9 +1246,11 @@ private void toggleQuickPermission(UIButton target, @SitePermission.Category int
             mQuickPermissionWidget = new QuickPermissionWidget(getContext());
         }
 
-        if (mQuickPermissionWidget.isVisible() && mQuickPermissionWidget.getCategory() == aCategory) {
+        if (mQuickPermissionWidget.isVisible()) {
             mQuickPermissionWidget.hide(KEEP_WIDGET);
-            return;
+            if (mQuickPermissionWidget.getCategory() == aCategory) {
+                return;
+            }
         }
 
         String uri = UrlUtils.getHost(mAttachedWindow.getSession().getCurrentUri());