diff --git a/app/src/main/java/me/impy/aegis/ui/ScannerActivity.java b/app/src/main/java/me/impy/aegis/ui/ScannerActivity.java
index 7c582f34..d0de6467 100644
--- a/app/src/main/java/me/impy/aegis/ui/ScannerActivity.java
+++ b/app/src/main/java/me/impy/aegis/ui/ScannerActivity.java
@@ -57,6 +57,11 @@ public class ScannerActivity extends AegisActivity implements ZXingScannerView.R
         setContentView(_scannerView);
     }
 
+    @Override
+    protected void setPreferredTheme(boolean darkMode) {
+        setTheme(R.style.AppTheme_Fullscreen);
+    }
+
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         _menu = menu;
@@ -78,8 +83,8 @@ public class ScannerActivity extends AegisActivity implements ZXingScannerView.R
                         _facing = CAMERA_FACING_BACK;
                         break;
                 }
-                _scannerView.startCamera(getCameraId(_facing));
                 updateCameraIcon();
+                _scannerView.startCamera(getCameraId(_facing));
                 return true;
             case R.id.action_lock:
             default: