--- Native/Src/Packages/Gui/Core/Src/BaseButton.cpp	Thu Jul 29 17:11:59 2021
+++ trunk/Noesis/Native/Src/Packages/Gui/Core/Src/BaseButton.cpp	Wed Aug 24 16:52:18 2022
@@ -301,7 +301,14 @@
     
     if (GetClickMode() != ClickMode_Hover)
     {
-        Focus();
+        bool b = Focus();
+        if (!b && GetFocusable()) {
+            // Only capture mouse if Focus() fails
+            e.handled = true;
+            ParentClass::OnMouseLeftButtonDown(e);
+            return;
+        }
+
         if (e.leftButton == MouseButtonState_Pressed)
         {
             if (CaptureMouse())
