diff --git a/Client/View/MainForm.cs b/Client/View/MainForm.cs
index f67e7371..c1bf2309 100644
--- a/Client/View/MainForm.cs
+++ b/Client/View/MainForm.cs
@@ -13,7 +13,8 @@ using CMS_Client.Browser_Tools;
 using Chromium.Remote;
 using Chromium.Remote.Event;
 using System.IO;
-
+using static Client.Utils.Constants;
+
 namespace CMS_Client.View
 {
     public partial class MainForm : Form
@@ -87,17 +88,21 @@ namespace CMS_Client.View
             if (this.WindowState == FormWindowState.Minimized)
             {
                 NcWindow.ShowTaskBar();
-                //if (Config.VendorHmiConfig.Enabled)
-                    //NcFrm.Hide();
+                if (Config.VendorHmiConfig.Enabled)
+                    NcFrm.Hide();
             }
             else
             {
-                NcWindow.ShowNcWindow();
-                if (Config.VendorHmiConfig.Enabled)
+                if (Config.VendorHmiConfig.Enabled)
+                    NcFrm.Show();
+
+                if (NcWindow.State == NcState.SHOW)
                 {
                     HideNCWindow();
                     ShowNCWindow();
                 }
+                else
+                    HideNCWindow();
             }
 
             //Refresh Browser Paint