diff --git a/apps/home/controller.cpp b/apps/home/controller.cpp
index 6d902115a..9d83267b6 100644
--- a/apps/home/controller.cpp
+++ b/apps/home/controller.cpp
@@ -7,7 +7,8 @@ namespace Home {
 
 Controller::Controller(Responder * parentResponder) :
   ViewController(parentResponder),
-  m_tableView(TableView(this))
+  m_tableView(TableView(this)),
+  m_activeIndex(0)
 {
 }
 
@@ -39,6 +40,10 @@ bool Controller::handleEvent(Ion::Events::Event event) {
   return true;
 }
 
+void Controller::didBecomeFirstResponder() {
+  setActiveIndex(m_activeIndex);
+}
+
 View * Controller::view() {
   return &m_tableView;
 }
@@ -71,9 +76,6 @@ void Controller::setActiveIndex(int index) {
   if (m_activeIndex < 0 && m_activeIndex >= k_numberOfApps) {
     return;
   }
-  if (index == m_activeIndex) {
-    return;
-  }
 
   int j = m_activeIndex/k_numberOfColumns;
   int i = m_activeIndex-j*k_numberOfColumns; // Avoid modulo
diff --git a/apps/home/controller.h b/apps/home/controller.h
index 4a2f2cd4e..7cbef8a58 100644
--- a/apps/home/controller.h
+++ b/apps/home/controller.h
@@ -13,6 +13,7 @@ public:
   View * view() override;
 
   bool handleEvent(Ion::Events::Event event) override;
+  void didBecomeFirstResponder() override;
 
   virtual int numberOfRows() override;
   virtual int numberOfColumns() override;