diff --git a/applications/lazimageeditor/lazimageeditor.lpi b/applications/lazimageeditor/lazimageeditor.lpi
index c388327a9..e7d12773e 100644
--- a/applications/lazimageeditor/lazimageeditor.lpi
+++ b/applications/lazimageeditor/lazimageeditor.lpi
@@ -58,10 +58,11 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Main"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1266"/>
-        <CursorPos X="24" Y="1279"/>
+        <TopLine Value="840"/>
+        <CursorPos X="21" Y="866"/>
         <UsageCount Value="86"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -69,11 +70,10 @@
       <Unit2>
         <Filename Value="picturectrls.pas"/>
         <UnitName Value="PictureCtrls"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="2"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1100"/>
-        <CursorPos X="1" Y="1123"/>
+        <TopLine Value="136"/>
+        <CursorPos X="23" Y="167"/>
         <UsageCount Value="35"/>
         <Loaded Value="True"/>
       </Unit2>
@@ -444,127 +444,123 @@
         <UsageCount Value="10"/>
       </Unit45>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="29" HistoryIndex="28">
       <Position1>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="724" Column="14" TopLine="707"/>
+        <Caret Line="702" Column="28" TopLine="679"/>
       </Position1>
       <Position2>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="745" Column="35" TopLine="731"/>
+        <Caret Line="1091" Column="16" TopLine="1076"/>
       </Position2>
       <Position3>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="784" Column="14" TopLine="763"/>
+        <Caret Line="630" Column="44" TopLine="620"/>
       </Position3>
       <Position4>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="1095" Column="37" TopLine="1069"/>
+        <Caret Line="735" Column="9" TopLine="709"/>
       </Position4>
       <Position5>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="37" Column="94" TopLine="34"/>
+        <Caret Line="186" Column="22" TopLine="167"/>
       </Position5>
       <Position6>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="114" Column="32" TopLine="88"/>
+        <Caret Line="700" Column="22" TopLine="674"/>
       </Position6>
       <Position7>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="117" Column="54" TopLine="91"/>
+        <Caret Line="725" Column="14" TopLine="699"/>
       </Position7>
       <Position8>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="186" Column="22" TopLine="160"/>
+        <Caret Line="735" Column="14" TopLine="709"/>
       </Position8>
       <Position9>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="678" Column="15" TopLine="665"/>
+        <Caret Line="752" Column="35" TopLine="726"/>
       </Position9>
       <Position10>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="707" Column="15" TopLine="681"/>
+        <Caret Line="790" Column="27" TopLine="764"/>
       </Position10>
       <Position11>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="710" Column="15" TopLine="684"/>
+        <Caret Line="778" Column="40" TopLine="764"/>
       </Position11>
       <Position12>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="792" Column="7" TopLine="768"/>
+        <Caret Line="920" Column="49" TopLine="902"/>
       </Position12>
       <Position13>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="791" Column="31" TopLine="765"/>
+        <Caret Line="1123" Column="36" TopLine="1106"/>
       </Position13>
       <Position14>
         <Filename Value="picturectrls.pas"/>
-        <Caret Line="729" Column="1" TopLine="712"/>
+        <Caret Line="1121" Column="21" TopLine="1100"/>
       </Position14>
       <Position15>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="702" Column="13" TopLine="659"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="364" Column="61" TopLine="355"/>
       </Position15>
       <Position16>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="1090" Column="38" TopLine="1076"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="495" Column="13" TopLine="469"/>
       </Position16>
       <Position17>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="188" Column="31" TopLine="172"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="502" Column="13" TopLine="476"/>
       </Position17>
       <Position18>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="702" Column="28" TopLine="679"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="510" Column="13" TopLine="484"/>
       </Position18>
       <Position19>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="1091" Column="16" TopLine="1076"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="569" Column="13" TopLine="543"/>
       </Position19>
       <Position20>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="630" Column="44" TopLine="620"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="576" Column="13" TopLine="550"/>
       </Position20>
       <Position21>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="735" Column="9" TopLine="709"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="597" Column="13" TopLine="571"/>
       </Position21>
       <Position22>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="186" Column="22" TopLine="167"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="604" Column="13" TopLine="578"/>
       </Position22>
       <Position23>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="700" Column="22" TopLine="674"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="611" Column="13" TopLine="585"/>
       </Position23>
       <Position24>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="725" Column="14" TopLine="699"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="646" Column="13" TopLine="620"/>
       </Position24>
       <Position25>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="735" Column="14" TopLine="709"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="653" Column="13" TopLine="627"/>
       </Position25>
       <Position26>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="752" Column="35" TopLine="726"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="660" Column="13" TopLine="634"/>
       </Position26>
       <Position27>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="790" Column="27" TopLine="764"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="674" Column="13" TopLine="648"/>
       </Position27>
       <Position28>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="778" Column="40" TopLine="764"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="681" Column="13" TopLine="655"/>
       </Position28>
       <Position29>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="920" Column="49" TopLine="902"/>
+        <Filename Value="main.pas"/>
+        <Caret Line="851" Column="13" TopLine="825"/>
       </Position29>
-      <Position30>
-        <Filename Value="picturectrls.pas"/>
-        <Caret Line="1123" Column="36" TopLine="1106"/>
-      </Position30>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
diff --git a/applications/lazimageeditor/main.pas b/applications/lazimageeditor/main.pas
index 113234f7d..33d39c319 100644
--- a/applications/lazimageeditor/main.pas
+++ b/applications/lazimageeditor/main.pas
@@ -863,6 +863,7 @@ begin
       YY1 := 0;
       YY2 := 0;
     end;
+  ActivePictureEdit.pcount := 0;
   ActivePictureEdit.Tool := Tool;
   UpdateToolSettings;
   ToolBarToolsClick(nil);
diff --git a/applications/lazimageeditor/picturectrls.pas b/applications/lazimageeditor/picturectrls.pas
index d1519552c..c259a6926 100644
--- a/applications/lazimageeditor/picturectrls.pas
+++ b/applications/lazimageeditor/picturectrls.pas
@@ -152,7 +152,6 @@ type
   protected
     FromColor, ToColor: TColor;
     paddr: array of TPoint;
-    pcount: integer;
     procedure Change; dynamic;
     procedure ColorChange; dynamic;
     procedure PictureSizeChange; dynamic;
@@ -165,6 +164,7 @@ type
     function GetToolDrag: TPictureEditToolDrag; virtual;
     procedure DrawToolDrag(X1, Y1, X2, Y2: integer); virtual;
   public
+    pcount: integer;
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;