diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 596b2f9ba6..865b264f48 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -96,7 +96,8 @@
         <activity
             android:name=".LoyaltyCardViewActivity"
             android:exported="true"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:theme="@style/AppTheme.NoActionBar"
+            android:showWhenLocked="true" />
         <activity
             android:name=".LoyaltyCardEditActivity"
             android:exported="true"
diff --git a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
index 41566aa11e..2d3aa8e4ec 100644
--- a/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
+++ b/app/src/main/java/protect/card_locker/LoyaltyCardViewActivity.java
@@ -667,11 +667,11 @@ protected void onResume() {
             }
 
             if (settings.getDisableLockscreenWhileViewingCard()) {
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
-                    setShowWhenLocked(true);
-                } else {
+                if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1) {
                     showWhenLockedSdkLessThan27(window);
                 }
+            } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+                setShowWhenLocked(false);
             }
 
             window.setAttributes(attributes);