diff --git a/components/packagetabs/packagetabs_impl.pas b/components/packagetabs/packagetabs_impl.pas
index aa3d7272e0..63dd9202a3 100644
--- a/components/packagetabs/packagetabs_impl.pas
+++ b/components/packagetabs/packagetabs_impl.pas
@@ -375,20 +375,22 @@ begin
 end;
 
 function TRecreateToolBarStamps.Changed: Boolean;
+var
+  LProjectChangeStamp: Integer;
 begin
+  if LazarusIDE.ActiveProject <> nil then
+    LProjectChangeStamp := LazarusIDE.ActiveProject.ChangeStamp
+  else
+    LProjectChangeStamp := Low(LProjectChangeStamp);
   Result := not(
-        (LazarusIDE.ActiveProject <> nil)
-    and (FCurProjectChangeStamp = LazarusIDE.ActiveProject.ChangeStamp)
+        (FCurProjectChangeStamp = LProjectChangeStamp)
     and (FPackagesChangeStamp = PackageGraphInterface.ChangeStamp)
     and (FInternalChangeStamp = FLastInternalChangeStamp)
     );
 
   if not Result then Exit;
 
-  if LazarusIDE.ActiveProject <> nil then
-    FCurProjectChangeStamp := LazarusIDE.ActiveProject.ChangeStamp
-  else
-    FCurProjectChangeStamp := Low(FCurProjectChangeStamp);
+  FCurProjectChangeStamp := LProjectChangeStamp;
   FPackagesChangeStamp := PackageGraphInterface.ChangeStamp;
   FLastInternalChangeStamp := FInternalChangeStamp;
 end;