diff --git a/src/DrawingProgram/DrawingProgramSelection.cpp b/src/DrawingProgram/DrawingProgramSelection.cpp
index c3c4eee..04b03f0 100644
--- a/src/DrawingProgram/DrawingProgramSelection.cpp
+++ b/src/DrawingProgram/DrawingProgramSelection.cpp
@@ -95,8 +95,10 @@ void DrawingProgramSelection::phone_selection_gui(PhoneDrawingProgramScreen& t)
 }
 
 Vector4f* DrawingProgramSelection::color_picker_color(Vector4f* oldColor) {
-    if(oldColor == &strokeColorChangeData.newColor)
-        return oldColor;
+    if(is_something_selected()) {
+        if(oldColor == &strokeColorChangeData.newColor)
+            return oldColor;
+    }
     return nullptr;
 }