diff --git a/imgui.cpp b/imgui.cpp
index 8e8ab2b6f..50b0219ab 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -8147,7 +8147,7 @@ bool ImGui::Selectable(const char* label, bool selected, ImGuiSelectableFlags fl
     if (flags & ImGuiSelectableFlags_Menu) button_flags |= ImGuiButtonFlags_PressedOnClick;
     if (flags & ImGuiSelectableFlags_MenuItem) button_flags |= ImGuiButtonFlags_PressedOnClick|ImGuiButtonFlags_PressedOnRelease;
     if (flags & ImGuiSelectableFlags_Disabled) button_flags |= ImGuiButtonFlags_Disabled;
-    if (flags & ImGuiSelectableFlags_HandleDoubleClick) button_flags |= ImGuiButtonFlags_PressedOnDoubleClick;
+    if (flags & ImGuiSelectableFlags_AllowDoubleClick) button_flags |= ImGuiButtonFlags_PressedOnDoubleClick;
     bool hovered, held;
     bool pressed = ButtonBehavior(bb_with_spacing, id, &hovered, &held, button_flags);
     if (flags & ImGuiSelectableFlags_Disabled)
diff --git a/imgui.h b/imgui.h
index 27a8ce95d..57a7f7977 100644
--- a/imgui.h
+++ b/imgui.h
@@ -506,7 +506,7 @@ enum ImGuiSelectableFlags_
     // Default: 0
     ImGuiSelectableFlags_DontClosePopups    = 1 << 0,   // Clicking this don't close parent popup window
     ImGuiSelectableFlags_SpanAllColumns     = 1 << 1,   // Selectable frame can span all columns (text will still fit in current column)
-    ImGuiSelectableFlags_HandleDoubleClick  = 1 << 2    // Generate press events on double clicks too
+    ImGuiSelectableFlags_AllowDoubleClick   = 1 << 2    // Generate press events on double clicks too
 };
 
 // User fill ImGuiIO.KeyMap[] array with indices into the ImGuiIO.KeysDown[512] array
diff --git a/imgui_demo.cpp b/imgui_demo.cpp
index 47e975262..b2e4e09eb 100644
--- a/imgui_demo.cpp
+++ b/imgui_demo.cpp
@@ -397,11 +397,9 @@ void ImGui::ShowTestWindow(bool* p_opened)
                 ImGui::Selectable("2. I am selectable", &selected[1]);
                 ImGui::Text("3. I am not selectable");
                 ImGui::Selectable("4. I am selectable", &selected[2]);
-                if (ImGui::Selectable("5. I am double clickable", selected[3], ImGuiSelectableFlags_HandleDoubleClick))
-                {
+                if (ImGui::Selectable("5. I am double clickable", selected[3], ImGuiSelectableFlags_AllowDoubleClick))
                     if (ImGui::IsMouseDoubleClicked(0))
                         selected[3] = !selected[3];
-                }
                 ImGui::TreePop();
             }
             if (ImGui::TreeNode("Rendering more text into the same block"))
diff --git a/imgui_internal.h b/imgui_internal.h
index 51d970939..eaeb312eb 100644
--- a/imgui_internal.h
+++ b/imgui_internal.h
@@ -152,15 +152,15 @@ inline void operator delete(void*, ImPlacementNewDummy, void*) {}
 
 enum ImGuiButtonFlags_
 {
-    ImGuiButtonFlags_Repeat                 = 1 << 0,
-    ImGuiButtonFlags_PressedOnClick         = 1 << 1,   // return pressed on click only (default requires click+release)
-    ImGuiButtonFlags_PressedOnRelease       = 1 << 2,   // return pressed on release only (default requires click+release)
-    ImGuiButtonFlags_FlattenChilds          = 1 << 3,
-    ImGuiButtonFlags_DontClosePopups        = 1 << 4,
-    ImGuiButtonFlags_Disabled               = 1 << 5,
-    ImGuiButtonFlags_AlignTextBaseLine      = 1 << 6,
-    ImGuiButtonFlags_NoKeyModifiers         = 1 << 7,
-    ImGuiButtonFlags_PressedOnDoubleClick   = 1 << 8
+    ImGuiButtonFlags_Repeat                 = 1 << 0,   // hold to repeat
+    ImGuiButtonFlags_PressedOnClick         = 1 << 1,   // return pressed on click (default requires click+release)
+    ImGuiButtonFlags_PressedOnRelease       = 1 << 2,   // return pressed on release (default requires click+release)
+    ImGuiButtonFlags_PressedOnDoubleClick   = 1 << 3,   // return pressed on double-click (default requires click+release)
+    ImGuiButtonFlags_FlattenChilds          = 1 << 4,   // allow interaction even if a child window is overlapping
+    ImGuiButtonFlags_DontClosePopups        = 1 << 5,   // disable automatically closing parent popup on press
+    ImGuiButtonFlags_Disabled               = 1 << 6,   // disable interaction
+    ImGuiButtonFlags_AlignTextBaseLine      = 1 << 7,   // vertically align button to match text baseline - ButtonEx() only
+    ImGuiButtonFlags_NoKeyModifiers         = 1 << 8,   // disable interaction if a key modifier is held
 };
 
 enum ImGuiTreeNodeFlags_