diff --git a/apps/shared/range_parameter_controller.cpp b/apps/shared/range_parameter_controller.cpp
index 5222bdcec..05501eb59 100644
--- a/apps/shared/range_parameter_controller.cpp
+++ b/apps/shared/range_parameter_controller.cpp
@@ -91,16 +91,10 @@ void RangeParameterController::tableViewDidChangeSelection(SelectableTableView *
 }
 
 bool RangeParameterController::handleEvent(Ion::Events::Event event) {
-  if (activeCell() == 2) {
-    if (event == Ion::Events::OK) {
-      m_interactiveRange->setYAuto(!m_interactiveRange->yAuto());
-      m_selectableTableView.reloadData();
-      return true;
-    }
-    return false;
-  }
-  if (m_interactiveRange->yAuto() && (activeCell() == 3 || activeCell() == 4)) {
-    return false;
+  if (activeCell() == 2 && event == Ion::Events::OK) {
+    m_interactiveRange->setYAuto(!m_interactiveRange->yAuto());
+    m_selectableTableView.reloadData();
+    return true;
   }
   if (event == Ion::Events::Back) {
     m_interactiveRange->setYAuto(m_previousSwitchState);