diff --git a/RNMail/RNMail.m b/RNMail/RNMail.m
index 7c77eac..fef868a 100644
--- a/RNMail/RNMail.m
+++ b/RNMail/RNMail.m
@@ -188,11 +188,8 @@ - (void)mailComposeController:(MFMailComposeViewController *)controller didFinis
     } else {
         RCTLogWarn(@"No callback registered for mail: %@", controller.title);
     }
-    UIViewController *ctrl = [[[[UIApplication sharedApplication] delegate] window] rootViewController];
-    while (ctrl.presentedViewController && ctrl != controller) {
-        ctrl = ctrl.presentedViewController;
-    }
-    [ctrl dismissViewControllerAnimated:YES completion:nil];
+    
+    [controller dismissViewControllerAnimated:YES completion:nil];
 }
 
 #pragma mark Private