diff --git a/radio/src/gui/128x64/model_outputs_arm.cpp b/radio/src/gui/128x64/model_outputs.cpp
similarity index 99%
rename from radio/src/gui/128x64/model_outputs_arm.cpp
rename to radio/src/gui/128x64/model_outputs.cpp
index 2e1437240..d82036a4b 100644
--- a/radio/src/gui/128x64/model_outputs_arm.cpp
+++ b/radio/src/gui/128x64/model_outputs.cpp
@@ -235,6 +235,7 @@ void menuModelLimits(event_t event)
 
     if (sub==k && event==EVT_KEY_FIRST(KEY_ENTER) && !READ_ONLY() && (k != MAX_OUTPUT_CHANNELS) ) {
       killEvents(event);
+      s_editMode = 0;
       POPUP_MENU_ADD_ITEM(STR_EDIT);
       POPUP_MENU_ADD_ITEM(STR_RESET);
       POPUP_MENU_ADD_ITEM(STR_COPY_TRIMS_TO_OFS);
diff --git a/radio/src/gui/CMakeLists.txt b/radio/src/gui/CMakeLists.txt
index 98a3a1352..c3714b044 100644
--- a/radio/src/gui/CMakeLists.txt
+++ b/radio/src/gui/CMakeLists.txt
@@ -9,6 +9,7 @@ set(GUI_SRC
   menu_model.cpp
   model_select.cpp
   model_setup.cpp
+  model_outputs.cpp
   model_failsafe.cpp
   model_module_options.cpp
   model_receiver_options.cpp
@@ -25,18 +26,6 @@ set(GUI_SRC
   view_statistics.cpp
   )
 
-if(GUI_DIR STREQUAL 128x64)
-   set(GUI_SRC
-      ${GUI_SRC}
-      model_outputs_arm.cpp
-      )
-else()
-  set(GUI_SRC
-    ${GUI_SRC}
-    model_outputs.cpp
-    )
-endif()
-
 set(SRC
   ${SRC}
   gui/common/widgets.cpp