diff --git a/radio/src/gui/colorlcd/input_edit.cpp b/radio/src/gui/colorlcd/input_edit.cpp
index 2565130e8..127b2335f 100644
--- a/radio/src/gui/colorlcd/input_edit.cpp
+++ b/radio/src/gui/colorlcd/input_edit.cpp
@@ -159,3 +159,11 @@ void InputEditWindow::buildBody(FormWindow* form)
   });
   lv_obj_set_width(btn->getLvObj(), lv_pct(100));
 }
+
+void InputEditWindow::deleteLater(bool detach, bool trash)
+{
+  if (!deleted()) {
+    CurveEdit::SetCurrentSource(0);
+    Page::deleteLater(detach, trash);
+  }
+}
diff --git a/radio/src/gui/colorlcd/input_edit.h b/radio/src/gui/colorlcd/input_edit.h
index 338a6e0f0..e1463df6d 100644
--- a/radio/src/gui/colorlcd/input_edit.h
+++ b/radio/src/gui/colorlcd/input_edit.h
@@ -38,4 +38,6 @@ class InputEditWindow : public Page
   Curve* preview;
 
   void buildBody(FormWindow *window);
+
+  void deleteLater(bool detach = true, bool trash = true) override;
 };
diff --git a/radio/src/gui/colorlcd/mixer_edit.cpp b/radio/src/gui/colorlcd/mixer_edit.cpp
index 08ded25f2..9167fb1c1 100644
--- a/radio/src/gui/colorlcd/mixer_edit.cpp
+++ b/radio/src/gui/colorlcd/mixer_edit.cpp
@@ -146,3 +146,11 @@ void MixEditWindow::buildBody(FormWindow* form)
   });
   lv_obj_set_width(btn->getLvObj(), lv_pct(100));
 }
+
+void MixEditWindow::deleteLater(bool detach, bool trash)
+{
+  if (!deleted()) {
+    CurveEdit::SetCurrentSource(0);
+    Page::deleteLater(detach, trash);
+  }
+}
diff --git a/radio/src/gui/colorlcd/mixer_edit.h b/radio/src/gui/colorlcd/mixer_edit.h
index 2c729cbc7..201c1cfc0 100644
--- a/radio/src/gui/colorlcd/mixer_edit.h
+++ b/radio/src/gui/colorlcd/mixer_edit.h
@@ -38,4 +38,6 @@ class MixEditWindow : public Page
 
   void buildHeader(Window *window);
   void buildBody(FormWindow *window);
+
+  void deleteLater(bool detach = true, bool trash = true) override;
 };