diff --git a/apps/settings/sub_controller.cpp b/apps/settings/sub_controller.cpp
index 6faf688b7..85b6ba0db 100644
--- a/apps/settings/sub_controller.cpp
+++ b/apps/settings/sub_controller.cpp
@@ -109,6 +109,10 @@ void SubController::viewWillAppear() {
   m_selectableTableView.reloadData();
 }
 
+void SubController::viewWillDisappear() {
+  m_selectableTableView.deselectTable();
+}
+
 StackViewController * SubController::stackController() const {
   return (StackViewController *)parentResponder();
 }
diff --git a/apps/settings/sub_controller.h b/apps/settings/sub_controller.h
index e6a3312d5..f33c1c80e 100644
--- a/apps/settings/sub_controller.h
+++ b/apps/settings/sub_controller.h
@@ -21,6 +21,7 @@ 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);