diff --git a/apps/gui/color_picker.c b/apps/gui/color_picker.c
index ce89655..6dc33a2 100644
--- a/apps/gui/color_picker.c
+++ b/apps/gui/color_picker.c
@@ -378,10 +378,9 @@
         if (button == BUTTON_REL)
             return ACTION_STD_OK;
     }
-    if ((button == BUTTON_REL) &&
-        pressed_slider != *selected_slider)
+    if (pressed_slider != *selected_slider)
         *selected_slider = pressed_slider;
-    else if (pressed_slider == *selected_slider)
+    //if (pressed_slider == *selected_slider)
     {
         x -= slider_left;
         rgb->rgb_val[pressed_slider] = 
diff --git a/apps/gui/list.c b/apps/gui/list.c
index 436038e..153e500 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -986,7 +986,11 @@
             pressing the selected item will "enter" it */
         line = y / gui_list->display->char_height;
         if (line != gui_list->selected_item - gui_list->start_item)
+        {
+            if (gui_list->start_item+line > gui_list->nb_items)
+                return ACTION_NONE;
             gui_synclist_select_item(lists, gui_list->start_item+line);
+        }
         
         if (button == BUTTON_REPEAT)
             return ACTION_STD_CONTEXT;