diff --git a/applications/iconeditor/preview.lfm b/applications/iconeditor/preview.lfm
index da452cb08..9d27bb572 100644
--- a/applications/iconeditor/preview.lfm
+++ b/applications/iconeditor/preview.lfm
@@ -1,15 +1,13 @@
 object PreviewForm: TPreviewForm
-  BorderStyle = bsSizeToolWin
-  Caption = 'Preview'
-  ClientHeight = 200
-  ClientWidth = 200
-  FormStyle = fsStayOnTop
-  OnCreate = FormCreate
-  PixelsPerInch = 96
-  HorzScrollBar.Page = 195
-  VertScrollBar.Page = 207
   Left = 849
   Height = 200
   Top = 79
   Width = 200
+  HorzScrollBar.Page = 199
+  VertScrollBar.Page = 199
+  BorderStyle = bsSizeToolWin
+  Caption = 'Preview'
+  FormStyle = fsStayOnTop
+  OnClose = FormClose
+  OnCreate = FormCreate
 end
diff --git a/applications/iconeditor/preview.lrs b/applications/iconeditor/preview.lrs
index a89c83f8f..c66f6514a 100644
--- a/applications/iconeditor/preview.lrs
+++ b/applications/iconeditor/preview.lrs
@@ -1,9 +1,9 @@
 { This is an automatically generated lazarus resource file }
 
 LazarusResources.Add('TPreviewForm','FORMDATA',[
-  'TPF0'#12'TPreviewForm'#11'PreviewForm'#11'BorderStyle'#7#13'bsSizeToolWin'#7
-  +'Caption'#6#7'Preview'#12'ClientHeight'#3#200#0#11'ClientWidth'#3#200#0#9'Fo'
-  +'rmStyle'#7#11'fsStayOnTop'#8'OnCreate'#7#10'FormCreate'#13'PixelsPerInch'#2
-  +'`'#18'HorzScrollBar.Page'#3#195#0#18'VertScrollBar.Page'#3#207#0#4'Left'#3
-  +'Q'#3#6'Height'#3#200#0#3'Top'#2'O'#5'Width'#3#200#0#0#0
+  'TPF0'#12'TPreviewForm'#11'PreviewForm'#4'Left'#3'Q'#3#6'Height'#3#200#0#3'To'
+  +'p'#2'O'#5'Width'#3#200#0#18'HorzScrollBar.Page'#3#199#0#18'VertScrollBar.Pa'
+  +'ge'#3#199#0#11'BorderStyle'#7#13'bsSizeToolWin'#7'Caption'#6#7'Preview'#9'F'
+  +'ormStyle'#7#11'fsStayOnTop'#7'OnClose'#7#9'FormClose'#8'OnCreate'#7#10'Form'
+  +'Create'#0#0
 ]);
diff --git a/applications/iconeditor/preview.pas b/applications/iconeditor/preview.pas
index a91414507..30ebaf569 100644
--- a/applications/iconeditor/preview.pas
+++ b/applications/iconeditor/preview.pas
@@ -38,6 +38,7 @@ type
   { TPreviewForm }
 
   TPreviewForm = class(TForm)
+    procedure FormClose(Sender: TObject; var CloseAction: TCloseAction);
     procedure FormCreate(Sender: TObject);
   private
     { private declarations }
@@ -50,9 +51,15 @@ var
   View: TPictureView;
 
 implementation
-
+uses main;
 { TPreviewForm }
 
+procedure TPreviewForm.FormClose(Sender: TObject; var CloseAction: TCloseAction
+  );
+begin
+  MainForm.ViewShowPreview.Checked:=False;
+end;
+
 procedure TPreviewForm.FormCreate(Sender: TObject);
 begin
   View := TPictureView.Create(Self);
@@ -73,3 +80,4 @@ initialization
 
 end.
 
+