diff --git a/MVMCoreUI/BaseControllers/MFViewController.m b/MVMCoreUI/BaseControllers/MFViewController.m
index 256bf050..edbabf80 100644
--- a/MVMCoreUI/BaseControllers/MFViewController.m
+++ b/MVMCoreUI/BaseControllers/MFViewController.m
@@ -527,6 +527,13 @@
     }
 }
 
+- (void)viewWillDisappear:(BOOL)animated {
+    [super viewWillDisappear:animated];
+    if (self.selectedField) {
+        [self.selectedField resignFirstResponder];
+    }
+}
+
 - (void)dealloc {
     [self stopObservingForResponseJSONUpdates];
     MVMCoreLog(@"%@ deallocated", [[self class] description]);