diff --git a/fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/ConnectScannerViewModel.kt b/fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/ConnectScannerViewModel.kt
index 9b0b498fbc..25df12f3db 100644
--- a/fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/ConnectScannerViewModel.kt
+++ b/fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/ConnectScannerViewModel.kt
@@ -120,9 +120,7 @@ internal class ConnectScannerViewModel @Inject constructor(
 
     fun handleBackPress() {
         when (backButtonBehaviour.value) {
-            BackButtonBehaviour.DISABLED, null -> { /* Do nothing */
-            }
-
+            BackButtonBehaviour.DISABLED, null -> { /* Do nothing */ }
             BackButtonBehaviour.EXIT_WITH_ERROR -> _finish.send(false)
             BackButtonBehaviour.EXIT_FORM -> {
                 _scannerConnected.send(false)
diff --git a/fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/controller/ConnectScannerControllerFragment.kt b/fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/controller/ConnectScannerControllerFragment.kt
index d8dc7b9836..a77cbd0cdb 100644
--- a/fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/controller/ConnectScannerControllerFragment.kt
+++ b/fingerprint/connect/src/main/java/com/simprints/fingerprint/connect/screens/controller/ConnectScannerControllerFragment.kt
@@ -81,8 +81,7 @@ internal class ConnectScannerControllerFragment : Fragment(R.layout.fragment_con
     }
 
     private val hostFragment: Fragment?
-        get() = childFragmentManager
-            .findFragmentById(R.id.connect_scanner_host_fragment)
+        get() = childFragmentManager.findFragmentById(R.id.connect_scanner_host_fragment)
 
     private val internalNavController: NavController?
         get() = hostFragment?.findNavController()
@@ -157,13 +156,6 @@ internal class ConnectScannerControllerFragment : Fragment(R.layout.fragment_con
         }
 
         internalNavController?.setGraph(R.navigation.graph_connect_internal)
-
-        if (shouldRequestPermissions) {
-            shouldRequestPermissions = false
-            checkBluetoothPermissions()
-        } else {
-            alertHelper.handleResume { shouldRequestPermissions = true }
-        }
     }
 
     private fun showKnownScannerDialog(scannerId: String) {
@@ -187,7 +179,13 @@ internal class ConnectScannerControllerFragment : Fragment(R.layout.fragment_con
 
     override fun onResume() {
         super.onResume()
-        alertHelper.handleResume { shouldRequestPermissions = true }
+
+        if (shouldRequestPermissions) {
+            shouldRequestPermissions = false
+            checkBluetoothPermissions()
+        } else {
+            alertHelper.handleResume { shouldRequestPermissions = true }
+        }
     }
 
     override fun onPause() {