diff --git a/components/virtualtreeview-unstable/VirtualTrees.pas b/components/virtualtreeview-unstable/VirtualTrees.pas
index b6e9d62ad..4ca56362b 100644
--- a/components/virtualtreeview-unstable/VirtualTrees.pas
+++ b/components/virtualtreeview-unstable/VirtualTrees.pas
@@ -15407,6 +15407,11 @@ begin
         // If a repaint is needed then paint the entire tree because of the ClearSelection call,
         if NeedInvalidate then
           Invalidate;
+        {$ifdef LCLGtk2}
+        //workaround for changing focus bug
+        if CharCode <> VK_TAB then
+          CharCode := 0;
+        {$endif}
       end
       else
       begin