diff --git a/components/codetools/codetoolmanager.pas b/components/codetools/codetoolmanager.pas
index 3e21c6a68c..960e156b3c 100644
--- a/components/codetools/codetoolmanager.pas
+++ b/components/codetools/codetoolmanager.pas
@@ -1919,6 +1919,7 @@ begin
   DebugLn('TCodeToolManager.GatherIdentifiers A ',Code.Filename,' x=',dbgs(x),' y=',dbgs(y));
   {$ENDIF}
   if not InitCurCodeTool(Code) then exit;
+  if IdentifierList<>nil then IdentifierList.Clear;
   CursorPos.X:=X;
   CursorPos.Y:=Y;
   CursorPos.Code:=Code;
diff --git a/lcl/interfaces/gtk/gtkproc.inc b/lcl/interfaces/gtk/gtkproc.inc
index 74006163a5..bab8e47a44 100644
--- a/lcl/interfaces/gtk/gtkproc.inc
+++ b/lcl/interfaces/gtk/gtkproc.inc
@@ -3828,7 +3828,8 @@ function CreateFixedClientWidget(WithWindow: Boolean = True): PGTKWidget;
 begin
   Result := gtk_fixed_new();
   {$IFDEF GTK2}
-  gtk_fixed_set_has_window(PGtkFixed(Result), WithWindow);
+  if WithWindow then
+    gtk_fixed_set_has_window(PGtkFixed(Result), true);
   {$ENDIF}
 end;
 
@@ -7860,7 +7861,7 @@ var
     Result:=gtk_notebook_new;
     NoteBookWidget := PGtkNoteBook(Result);
     //NoteBookPageWidget := gtk_hbox_new(false, 0);
-    NoteBookPageClientAreaWidget := CreateFixedClientWidget(False);
+    NoteBookPageClientAreaWidget := CreateFixedClientWidget{$IFDEF GtkNoWindowFixed}(false){$ENDIF};
     gtk_widget_show(NoteBookPageClientAreaWidget);
     //gtk_container_add(GTK_CONTAINER(NoteBookPageWidget),
     //                  NoteBookPageClientAreaWidget);
@@ -8063,7 +8064,7 @@ begin
       If CompareText(WName,LazGtkStyleNames[lgsGroupBox])=0 then begin
         lgs:=lgsGroupBox;
         StyleObject^.Widget := gtk_frame_new('GroupBox');
-        WindowFixedWidget:=CreateFixedClientWidget;
+        WindowFixedWidget:=CreateFixedClientWidget{$IFDEF GtkNoWindowFixed}(false){$ENDIF};
         gtk_widget_show(WindowFixedWidget);
         gtk_container_add(PGtkContainer(StyleObject^.Widget), WindowFixedWidget);
         gtk_object_set_data(PGtkObject(StyleObject^.Widget),'fixedwidget',WindowFixedWidget);
diff --git a/lcl/interfaces/gtk/gtkproc.pp b/lcl/interfaces/gtk/gtkproc.pp
index 9259298686..089eb79d02 100644
--- a/lcl/interfaces/gtk/gtkproc.pp
+++ b/lcl/interfaces/gtk/gtkproc.pp
@@ -367,7 +367,7 @@ function FindFixedLastChildListItem(ParentFixed: PGtkFixed): PGList;
 function GetFixedChildListWidget(Item: PGList): PGtkWidget;
 
 // fixed widgets
-function CreateFixedClientWidget(WithWindow: Boolean = True): PGTKWidget;
+function CreateFixedClientWidget(WithWindow: Boolean = true): PGTKWidget;
 Procedure FixedMoveControl(Parent, Child: PGTKWidget; Left, Top: Longint);
 Procedure FixedPutControl(Parent, Child: PGTKWidget; Left, Top: Longint);
 
diff --git a/lcl/interfaces/gtk/gtkwidgetset.inc b/lcl/interfaces/gtk/gtkwidgetset.inc
index 01ba905044..50c904603d 100644
--- a/lcl/interfaces/gtk/gtkwidgetset.inc
+++ b/lcl/interfaces/gtk/gtkwidgetset.inc
@@ -4632,13 +4632,13 @@ begin
     {$undef GtkNoWindowFixed}
   {$endif}
 
-  {$ifndef GtkNoWindowFixed}
-  Result := gtk_hbox_new(false, 0);
-  TempWidget := CreateFixedClientWidget;
-  {$else}
+  {$ifdef GtkNoWindowFixed}
   Result := gtk_event_box_new;
   gtk_event_box_set_visible_window(PGtkEventBox(Result), False);
   TempWidget := CreateFixedClientWidget(False);
+  {$else}
+  Result := gtk_hbox_new(false, 0);
+  TempWidget := CreateFixedClientWidget;
   {$endif}
   gtk_container_add(GTK_CONTAINER(Result), TempWidget);
   gtk_widget_show(TempWidget);
@@ -5272,7 +5272,7 @@ begin
     // -> add a dummy page
     DummyWidget := gtk_hbox_new(false, 0);
     {$IFDEF Gtk}
-    AWidget := CreateFixedClientWidget;
+    AWidget := CreateFixedClientWidget{$IFDEF GtkNoWindowFixed}(false){$ENDIF};
     gtk_widget_show(AWidget);
     //gtk_box_pack_start_defaults(GTK_BOX(DummyWidget),AWidget);
     gtk_container_add(GTK_CONTAINER(DummyWidget), AWidget);
diff --git a/lcl/interfaces/gtk/gtkwsstdctrls.pp b/lcl/interfaces/gtk/gtkwsstdctrls.pp
index ae0c4b1f5d..06fe1d80f1 100644
--- a/lcl/interfaces/gtk/gtkwsstdctrls.pp
+++ b/lcl/interfaces/gtk/gtkwsstdctrls.pp
@@ -1644,7 +1644,7 @@ var
   p          : pointer;          // ptr to the newly created GtkWidget
 begin
   P := gtk_frame_new (AParams.Caption);
-  TempWidget := CreateFixedClientWidget;
+  TempWidget := CreateFixedClientWidget{$IFDEF GtkNoWindowFixed}(false){$ENDIF};
   gtk_container_add(GTK_CONTAINER(p), TempWidget);
   gtk_widget_show(TempWidget);
   SetFixedWidget(p, TempWidget);