diff --git a/src/olympia/reviewers/tests/test_utils.py b/src/olympia/reviewers/tests/test_utils.py
index c49103f92c13..dd509dd36fd4 100644
--- a/src/olympia/reviewers/tests/test_utils.py
+++ b/src/olympia/reviewers/tests/test_utils.py
@@ -463,6 +463,10 @@ def test_actions_public_static_theme(self):
             == expected
         )
 
+    @override_switch('enable-policy-review-selection', active=True)
+    def test_actions_public_static_theme_with_policy_review_selection(self):
+        self.test_actions_public_static_theme()
+
     def test_actions_no_version(self):
         """Addons with no versions in that channel have no version set."""
         expected = []
diff --git a/src/olympia/reviewers/utils.py b/src/olympia/reviewers/utils.py
index 24774f7a2d47..9552afe9a64a 100644
--- a/src/olympia/reviewers/utils.py
+++ b/src/olympia/reviewers/utils.py
@@ -533,7 +533,7 @@ def get_actions(self):
         use_content_rejection = self.content_review and waffle.switch_is_active(
             'enable-content-rejection'
         )
-        policy_selection_enabled = waffle.switch_is_active(
+        policy_selection_enabled = not is_static_theme and waffle.switch_is_active(
             'enable-policy-review-selection'
         )
 
@@ -574,7 +574,6 @@ def get_actions(self):
             'label': 'Positive Review',
             'available': (
                 policy_selection_enabled
-                and not is_static_theme
                 and not self.content_review
                 and is_appropriate_reviewer
             ),
@@ -594,7 +593,6 @@ def get_actions(self):
             'label': 'Negative Review',
             'available': (
                 policy_selection_enabled
-                and not is_static_theme
                 and not self.content_review
                 and is_appropriate_reviewer
             ),
@@ -751,7 +749,7 @@ def get_actions(self):
                 'This will approve the selected versions. '
                 'The comments will be sent to the developer.'
             ),
-            'available': (not policy_selection_enabled and can_approve_multiple),
+            'available': not policy_selection_enabled and can_approve_multiple,
             'enforcement_actions': (DECISION_ACTIONS.AMO_APPROVE,),
             'resolves_cinder_jobs': True,
         }