diff --git a/imgui.cpp b/imgui.cpp
index 25239625b..7aa9f6deb 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -9315,7 +9315,7 @@ bool ImGui::ColorPicker4(const char* label, float col[4], ImGuiColorEditFlags fl
         if ((flags & ImGuiColorEditFlags_ModeMask_) == 0)
             flags |= ImGuiColorEditFlags_RGB | ImGuiColorEditFlags_HSV | ImGuiColorEditFlags_HEX;
         PushItemWidth((alpha ? bar1_pos_x : bar0_pos_x) + bars_width - picker_pos.x);
-        ImGuiColorEditFlags sub_flags = (flags & ImGuiColorEditFlags_NoAlpha) | ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoTooltip;
+        ImGuiColorEditFlags sub_flags = (flags & (ImGuiColorEditFlags_NoAlpha | ImGuiColorEditFlags_NoColorSquare)) | ImGuiColorEditFlags_NoPicker | ImGuiColorEditFlags_NoOptions | ImGuiColorEditFlags_NoTooltip;
         if (flags & ImGuiColorEditFlags_RGB)
             value_changed |= ColorEdit4("##rgb", col, sub_flags | ImGuiColorEditFlags_RGB);
         if (flags & ImGuiColorEditFlags_HSV)
diff --git a/imgui.h b/imgui.h
index f3612f119..cd455194d 100644
--- a/imgui.h
+++ b/imgui.h
@@ -663,16 +663,16 @@ enum ImGuiStyleVar_
 // Enumeration for ColorEdit3() / ColorEdit4() / ColorPicker3() / ColorPicker4()
 enum ImGuiColorEditFlags_
 {
-    ImGuiColorEditFlags_RGB             = 1 << 0,   // ColorEdit: Choose one among RGB/HSV/HEX. User can still use the options menu to change. ColorPicker: Choose any combination or RGB/HSX/HEX. (Default flag must be 0x01 for compatibility with old pre-1.51 API taking bool param).
-    ImGuiColorEditFlags_HSV             = 1 << 1,
-    ImGuiColorEditFlags_HEX             = 1 << 2,
-    ImGuiColorEditFlags_NoAlpha         = 1 << 3,   // ColorEdit/ColorPicker: show/edit Alpha component.
+    ImGuiColorEditFlags_RGB             = 1 << 0,   // ColorEdit: Default to one among RGB/HSV/HEX. User can still use the options menu to change. ColorPicker: Choose any combination or RGB/HSX/HEX..
+    ImGuiColorEditFlags_HSV             = 1 << 1,   // "
+    ImGuiColorEditFlags_HEX             = 1 << 2,   // "
+    ImGuiColorEditFlags_NoAlpha         = 1 << 3,   // ColorEdit, ColorPicker: show/edit Alpha component.
     ImGuiColorEditFlags_NoPicker        = 1 << 4,   // ColorEdit: Disable picker when clicking on colored square
     ImGuiColorEditFlags_NoOptions       = 1 << 5,   // ColorEdit: Disable toggling options menu when right-clicking colored square
-    ImGuiColorEditFlags_NoColorSquare   = 1 << 6,   // ColorEdit: Disable colored square
-    ImGuiColorEditFlags_NoInputs        = 1 << 7,   // ColorEdit: Disable inputs sliders/text edit, show only a button. ColorPicker: Disable all RGB/HSV/HEX sliders.
-    ImGuiColorEditFlags_NoTooltip       = 1 << 8,   // ColorEdit, ColorButton: Disable tooltip when hovering the color square.
-    ImGuiColorEditFlags_NoLabel         = 1 << 9,   // ColorEdit: Disable display of inline text label, however the label is still shown in tooltip and picker
+    ImGuiColorEditFlags_NoColorSquare   = 1 << 6,   // ColorEdit, ColorPicker: Disable colored square.
+    ImGuiColorEditFlags_NoInputs        = 1 << 7,   // ColorEdit, ColorPicker: Disable inputs sliders/text widgets, show only the colored square.
+    ImGuiColorEditFlags_NoTooltip       = 1 << 8,   // ColorEdit, ColorButton: Disable tooltip when hovering the colored square.
+    ImGuiColorEditFlags_NoLabel         = 1 << 9,   // ColorEdit: Disable display of inline text label (however the label is still used in tooltip and picker)
     ImGuiColorEditFlags_ModeMask_       = ImGuiColorEditFlags_RGB|ImGuiColorEditFlags_HSV|ImGuiColorEditFlags_HEX
 };