diff --git a/escher/src/modal_view_controller.cpp b/escher/src/modal_view_controller.cpp
index bbba5cceb..699d75436 100644
--- a/escher/src/modal_view_controller.cpp
+++ b/escher/src/modal_view_controller.cpp
@@ -136,7 +136,9 @@ void ModalViewController::dismissModalViewController() {
 }
 
 void ModalViewController::didBecomeFirstResponder() {
-  Container::activeApp()->setFirstResponder(m_regularViewController);
+  Container::activeApp()->setFirstResponder(
+    isDisplayingModal() ? m_currentModalViewController : m_regularViewController
+  );
 }
 
 bool ModalViewController::handleEvent(Ion::Events::Event event) {