diff --git a/MasterPassword/ObjC/iOS/MPCombinedViewController.m b/MasterPassword/ObjC/iOS/MPCombinedViewController.m
index ee7fdf0f..69b55f18 100644
--- a/MasterPassword/ObjC/iOS/MPCombinedViewController.m
+++ b/MasterPassword/ObjC/iOS/MPCombinedViewController.m
@@ -98,7 +98,7 @@
 - (UIStoryboardSegue *)segueForUnwindingToViewController:(UIViewController *)toViewController
                                       fromViewController:(UIViewController *)fromViewController identifier:(NSString *)identifier {
 
-    if ([identifier isEqualToString:@"emergency"]) {
+    if ([identifier isEqualToString:@"unwind-emergency"]) {
         MPEmergencySegue *segue = [[MPEmergencySegue alloc] initWithIdentifier:identifier
                                                                         source:fromViewController destination:toViewController];
         segue.unwind = YES;
diff --git a/MasterPassword/ObjC/iOS/MPEmergencyViewController.m b/MasterPassword/ObjC/iOS/MPEmergencyViewController.m
index 48cbe777..187bfa5f 100644
--- a/MasterPassword/ObjC/iOS/MPEmergencyViewController.m
+++ b/MasterPassword/ObjC/iOS/MPEmergencyViewController.m
@@ -23,6 +23,7 @@
     MPKey *_key;
     NSOperationQueue *_emergencyKeyQueue;
     NSOperationQueue *_emergencyPasswordQueue;
+    NSArray *_notificationObservers;
 }
 
 - (void)viewDidLoad {
@@ -41,12 +42,14 @@
     [super viewWillAppear:animated];
 
     [self reset];
+    [self registerObservers];
 }
 
 - (void)viewDidDisappear:(BOOL)animated {
 
     [super viewDidDisappear:animated];
 
+    [self removeObservers];
     [self reset];
 }
 
@@ -172,4 +175,28 @@
     [self updateKey];
 }
 
+- (void)registerObservers {
+
+    if ([_notificationObservers count])
+        return;
+
+    Weakify(self);
+    _notificationObservers = @[
+            [[NSNotificationCenter defaultCenter]
+                    addObserverForName:UIApplicationWillResignActiveNotification object:nil
+                                 queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
+                Strongify(self);
+
+                [self performSegueWithIdentifier:@"unwind-emergency" sender:self];
+            }],
+    ];
+}
+
+- (void)removeObservers {
+
+    for (id observer in _notificationObservers)
+        [[NSNotificationCenter defaultCenter] removeObserver:observer];
+    _notificationObservers = nil;
+}
+
 @end
diff --git a/MasterPassword/ObjC/iOS/Storyboard.storyboard b/MasterPassword/ObjC/iOS/Storyboard.storyboard
index af00c46e..fa09df39 100644
--- a/MasterPassword/ObjC/iOS/Storyboard.storyboard
+++ b/MasterPassword/ObjC/iOS/Storyboard.storyboard
@@ -949,7 +949,7 @@
                                             <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                         </state>
                                         <connections>
-                                            <segue destination="p6o-h3-NRH" kind="unwind" unwindAction="unwindToCombined:" id="E2V-ll-ZD7"/>
+                                            <segue destination="p6o-h3-NRH" kind="unwind" identifier="unwind-emergency" unwindAction="unwindToCombined:" id="E2V-ll-ZD7"/>
                                         </connections>
                                     </button>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1lc-e7-Qme" userLabel="Emergency Generator">
@@ -1060,7 +1060,7 @@
                                                     <color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                 </state>
                                                 <connections>
-                                                    <segue destination="p6o-h3-NRH" kind="unwind" identifier="emergency" unwindAction="unwindToCombined:" id="VI2-VR-bQc"/>
+                                                    <segue destination="p6o-h3-NRH" kind="unwind" identifier="unwind-emergency" unwindAction="unwindToCombined:" id="VI2-VR-bQc"/>
                                                 </connections>
                                             </button>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J2u-kc-30c" userLabel="Settings Button">
@@ -1200,6 +1200,7 @@
                         <outlet property="tipContainer" destination="beo-cJ-jIn" id="BdT-0M-8qC"/>
                         <outlet property="typeControl" destination="e4b-Iv-Pk9" id="S69-yO-7bv"/>
                         <outlet property="userNameField" destination="XAC-Da-lpf" id="XCk-0H-IcI"/>
+                        <segue destination="p6o-h3-NRH" kind="unwind" identifier="unwind-emergency" unwindAction="unwindToCombined:" id="XI2-ax-Rkg"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="2GS-rH-ANj" userLabel="First Responder" sceneMemberID="firstResponder"/>