diff --git a/apps/settings/sub_controller.cpp b/apps/settings/sub_controller.cpp
index a4b250a3d..9e8de3df6 100644
--- a/apps/settings/sub_controller.cpp
+++ b/apps/settings/sub_controller.cpp
@@ -48,7 +48,7 @@ View * SubController::view() {
   return &m_selectableTableView;
 }
 
-void SubController::didBecomeFirstResponder() {
+void SubController::didEnterResponderChain(Responder * previousResponder) {
   m_selectableTableView.selectCellAtLocation(0, valueIndexAtPreferenceIndex(m_preferenceIndex));
   app()->setFirstResponder(&m_selectableTableView);
 }
@@ -109,7 +109,7 @@ void SubController::viewWillAppear() {
   m_selectableTableView.reloadData();
 }
 
-void SubController::viewWillDisappear() {
+void SubController::willExitResponderChain(Responder * nextResponder) {
   m_selectableTableView.deselectTable();
 }
 
diff --git a/apps/settings/sub_controller.h b/apps/settings/sub_controller.h
index 98dfabfed..36e8cb92c 100644
--- a/apps/settings/sub_controller.h
+++ b/apps/settings/sub_controller.h
@@ -13,7 +13,8 @@ public:
   View * view() override;
   const char * title() override;
   bool handleEvent(Ion::Events::Event event) override;
-  void didBecomeFirstResponder() override;
+  void didEnterResponderChain(Responder * previousFirstResponder) override;
+  void willExitResponderChain(Responder * nextFirstResponder) override;
   int numberOfRows() override;
   KDCoordinate cellHeight() override;
   HighlightCell * reusableCell(int index) override;
@@ -21,7 +22,6 @@ public:
   void willDisplayCellForIndex(HighlightCell * cell, int index) override;
   void setNodeModel(const Node * nodeModel, int preferenceIndex);
   void viewWillAppear() override;
-  void viewWillDisappear() override;
 private:
   StackViewController * stackController() const;
   void setPreferenceAtIndexWithValueIndex(int preferenceIndex, int valueIndex);