diff --git a/comp/src/gb.form/.src/TabPanel/_TabPanelButton.class b/comp/src/gb.form/.src/TabPanel/_TabPanelButton.class
index 601d1eafe..8c8fc83b4 100644
--- a/comp/src/gb.form/.src/TabPanel/_TabPanelButton.class
+++ b/comp/src/gb.form/.src/TabPanel/_TabPanelButton.class
@@ -207,8 +207,8 @@ Public Sub DrawingArea_MouseDown()
     Else
       If $bSelected Then Return
       hTabPanel.Index = GetIndex()
+      Me.Parent.SetFocus()
     Endif
-    Me.Parent.SetFocus()
   Endif
   
 End