diff --git a/pass/Base.lproj/Main.storyboard b/pass/Base.lproj/Main.storyboard
index 1cd7a3c..1a3c3ba 100644
--- a/pass/Base.lproj/Main.storyboard
+++ b/pass/Base.lproj/Main.storyboard
@@ -682,7 +682,7 @@
                     <navigationItem key="navigationItem" title="Scan OTP QR Codes" id="Hlb-5I-bfE">
                         <barButtonItem key="leftBarButtonItem" systemItem="cancel" id="KBZ-N2-OGE">
                             <connections>
-                                <segue destination="0gD-ix-2NF" kind="unwind" unwindAction="cancelOTPScannerWithSegue:" id="nZe-B6-MNt"/>
+                                <action selector="pressCancel:" destination="A9p-Qb-WmU" id="SYK-Qh-Cs7"/>
                             </connections>
                         </barButtonItem>
                     </navigationItem>
@@ -691,7 +691,6 @@
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="rqh-SR-bIq" userLabel="First Responder" sceneMemberID="firstResponder"/>
-                <exit id="0gD-ix-2NF" userLabel="Exit" sceneMemberID="exit"/>
             </objects>
             <point key="canvasLocation" x="7059" y="-1012"/>
         </scene>
diff --git a/pass/Controllers/OTPScannerController.swift b/pass/Controllers/OTPScannerController.swift
index 32bcb08..e8fe13d 100644
--- a/pass/Controllers/OTPScannerController.swift
+++ b/pass/Controllers/OTPScannerController.swift
@@ -14,6 +14,9 @@ class OTPScannerController: QRScannerController {
     
     var scannedOTP: String?
     
+    @IBAction func pressCancel(_ sender: UIBarButtonItem) {
+        navigationController?.popViewController(animated: true)
+    }
     // MARK: - AVCaptureMetadataOutputObjectsDelegate Methods
     func captureOutput(_ captureOutput: AVCaptureOutput!, didOutputMetadataObjects metadataObjects: [Any]!, from connection: AVCaptureConnection!) {