diff --git a/src/UI/UI_combobox.cpp b/src/UI/UI_combobox.cpp
index 55d5163..46ec1df 100644
--- a/src/UI/UI_combobox.cpp
+++ b/src/UI/UI_combobox.cpp
@@ -18,13 +18,12 @@ UI_combobox::UI_combobox(const json& j)
 
 void UI_combobox::set_selected(size_t selected)
 {
-    if (selected != p_selected)
+    if (selected == p_selected)
+        return;
+    p_selected = selected;
+    if (p_on_change != nullptr)
     {
-        p_selected = selected;
-        if (p_on_change != nullptr)
-        {
-            p_on_change(p_id, selected_text());
-        }
+        p_on_change(p_id, selected_text());
     }
 }
 
diff --git a/src/UI/UI_slider.cpp b/src/UI/UI_slider.cpp
index 6aaea97..a35649c 100644
--- a/src/UI/UI_slider.cpp
+++ b/src/UI/UI_slider.cpp
@@ -14,6 +14,11 @@ UI_slider::UI_slider(const json& j)
 
 void UI_slider::set_value(double value)
 {
+    if (value < p_min || value > p_max)
+        return;
+    if (value == p_value)
+        return;
+
     if (p_on_change != nullptr)
     {
         this->p_value = value;