diff --git a/Map_Script_Snippets.dproj b/Map_Script_Snippets.dproj
index 067dd7e..8df14d9 100644
--- a/Map_Script_Snippets.dproj
+++ b/Map_Script_Snippets.dproj
@@ -140,6 +140,7 @@
         <DCC_MapFile>3</DCC_MapFile>
         <DCC_DebugInformation>2</DCC_DebugInformation>
         <DCC_LocalDebugSymbols>true</DCC_LocalDebugSymbols>
+        <DCC_Define>madExcept;$(DCC_Define)</DCC_Define>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
diff --git a/src/MSS_Main.pas b/src/MSS_Main.pas
index b848c1b..4f78059 100644
--- a/src/MSS_Main.pas
+++ b/src/MSS_Main.pas
@@ -40,10 +40,10 @@   TMSS_Main = class(TNppBasePlugin)
     constructor Create;
     destructor Destroy; override;
     procedure DoNppnStartedUp; override;
-    procedure DoNppnToolbarModification; override;
     procedure InitNpp;
-    procedure ShowAbout;
     procedure ShowSnippetForm;
+    procedure CloseSnippetForm;
+    procedure ShowAbout;
   end;
 
 implementation
@@ -56,13 +56,15 @@ implementation
 { TMSS_Main }
 constructor TMSS_Main.Create;
 resourcestring
-  sSnipPanel = 'Show Snippet panel';
-  sAbout     = 'About';
+  sShowSnipPanel  = 'Show Snippet panel';
+  sCloseSnipPanel = 'Close Snippet panel';
+  sAbout          = 'About';
 begin
   inherited;
   PluginName := 'Map Script Snippets';
 
-  AddFuncItem(sSnipPanel, _CFuncShowSnippetForm);
+  AddFuncItem(sShowSnipPanel, _CFuncShowSnippetForm);
+  AddFuncItem(sCloseSnipPanel, _CFuncCloseSnippetForm);
   AddFuncItem('-', nil);
   AddFuncItem(sAbout, _CFuncShowAbout);
 end;
@@ -85,15 +87,6 @@ procedure TMSS_Main.DoNppnStartedUp;
     ShowSnippetForm
 end;
 
-procedure TMSS_Main.DoNppnToolbarModification;
-var
-  tb: TToolbarIcons;
-begin
-  tb.ToolbarIcon := 0;
-  tb.ToolbarBmp  := LoadImage(hInstance, 'IDB_TB_ICON', IMAGE_BITMAP, 0, 0, (LR_DEFAULTSIZE or LR_LOADMAP3DCOLORS));
-  SendMessage(self.NppData.NppHandle, NPPM_ADDTOOLBARICON, WPARAM(CmdIdFromDlgId(1)), LPARAM(@tb));
-end;
-
 procedure TMSS_Main.ShowAbout;
 begin
   if (not Assigned(GAboutFrm)) then
@@ -111,6 +104,15 @@ procedure TMSS_Main.ShowSnippetForm;
   GSnippetForm.Show;
 end;
 
+procedure TMSS_Main.CloseSnippetForm;
+begin
+  if Assigned(GSnippetForm) then
+  begin
+    GSnippetForm.Hide;
+    FreeAndNil(GSnippetForm);
+  end;
+end;
+
 initialization
   FNPPPlugin := TMSS_Main.Create as TNppBasePlugin;
 
diff --git a/src/MSS_PluginCInterface.pas b/src/MSS_PluginCInterface.pas
index 654816c..bd1d900 100644
--- a/src/MSS_PluginCInterface.pas
+++ b/src/MSS_PluginCInterface.pas
@@ -23,6 +23,7 @@
 
 interface
 procedure _CFuncShowSnippetForm; cdecl;
+procedure _CFuncCloseSnippetForm; cdecl;
 procedure _CFuncShowAbout; cdecl;
 
 implementation
@@ -34,6 +35,11 @@ procedure _CFuncShowSnippetForm; cdecl;
   (FNPPPlugin as TMSS_Main).ShowSnippetForm;
 end;
 
+procedure _CFuncCloseSnippetForm; cdecl;
+begin
+  (FNPPPlugin as TMSS_Main).CloseSnippetForm;
+end;
+
 procedure _CFuncShowAbout; cdecl;
 begin
   (FNPPPlugin as TMSS_Main).ShowAbout;