diff --git a/escher/src/tab_view_controller.cpp b/escher/src/tab_view_controller.cpp
index 8950c41bd..e08735552 100644
--- a/escher/src/tab_view_controller.cpp
+++ b/escher/src/tab_view_controller.cpp
@@ -96,8 +96,12 @@ bool TabViewController::handleEvent(Ion::Events::Event event) {
     }
     return true;
   }
-  if (event == Ion::Events::Down || event == Ion::Events::OK) {
-    setActiveTab(m_selectedChildIndex, event == Ion::Events::OK);
+  if (event == Ion::Events::Down) {
+    setActiveTab(m_activeChildIndex, false);
+    return true;
+  }
+  if (event == Ion::Events::OK) {
+    setActiveTab(m_selectedChildIndex, true);
     return true;
   }
   return false;