diff --git a/Client/View/MainForm.cs b/Client/View/MainForm.cs
index d0554b96..a3317dc1 100644
--- a/Client/View/MainForm.cs
+++ b/Client/View/MainForm.cs
@@ -515,8 +515,16 @@ namespace CMS_Client.View
                         {
                             this.Owner = null;
                             this.NcFrm.Owner = this;
-                            this.NcFrm.TopMost = true;
-                            this.NcFrm.TopMost = false;
+                            if(Config.VendorHmiConfig.Type == 2)
+                            {
+                                this.NcFrm.TopMost = false;
+                                this.TopMost = true;
+                            }
+                            else
+                            {
+                                this.NcFrm.TopMost = true;
+                                this.NcFrm.TopMost = false;
+                            }
                         }
                     });
 
@@ -525,9 +533,17 @@ namespace CMS_Client.View
                     if (this.NcFrm.Owner == null)
                     {
                         this.Owner = null;
-                        this.NcFrm.Owner = this;
-                        this.NcFrm.TopMost = true;
-                        this.NcFrm.TopMost = false;
+                        this.NcFrm.Owner = this;
+                        if (Config.VendorHmiConfig.Type == 2)
+                        {
+                            this.NcFrm.TopMost = false;
+                            this.TopMost = true;
+                        }
+                        else
+                        {
+                            this.NcFrm.TopMost = true;
+                            this.NcFrm.TopMost = false;
+                        }
                     }
                 }
             }
@@ -550,9 +566,19 @@ namespace CMS_Client.View
                     {
                         if (this.NcFrm.Owner != null)
                         {
-                            this.NcFrm.Owner = null;
-                            this.TopMost = true;
-                            this.TopMost = false;
+                            this.NcFrm.Owner = null;
+
+                            if (Config.VendorHmiConfig.Type == 2)
+                            {
+                                this.NcFrm.TopMost = true;
+                                this.TopMost = false;
+                            }
+                            else
+                            {
+                                this.TopMost = true;
+                                this.TopMost = false;
+                            }
+
                         }
                     });
 
@@ -562,7 +588,18 @@ namespace CMS_Client.View
                     {
                         this.NcFrm.Owner = null;
                         this.TopMost = true;
-                        this.TopMost = false;
+                        this.TopMost = false;
+
+                        if (Config.VendorHmiConfig.Type == 2)
+                        {
+                            this.NcFrm.TopMost = false;
+                            this.TopMost = true;
+                        }
+                        else
+                        {
+                            this.TopMost = true;
+                            this.TopMost = false;
+                        }
                     }
                 }
             }
diff --git a/Client/View/NcForm.Designer.cs b/Client/View/NcForm.Designer.cs
index 6513f781..a478274b 100644
--- a/Client/View/NcForm.Designer.cs
+++ b/Client/View/NcForm.Designer.cs
@@ -36,7 +36,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(101)))), ((int)(((byte)(113)))), ((int)(((byte)(120)))));
             this.ClientSize = new System.Drawing.Size(1920, 1280);
-            this.Cursor = System.Windows.Forms.Cursors.WaitCursor;
+            this.Cursor = System.Windows.Forms.Cursors.Default;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "NcForm";
             this.ShowIcon = false;
diff --git a/Step/wwwroot/src/modules/alarms-list.ts b/Step/wwwroot/src/modules/alarms-list.ts
index aecc313c..9f7c6c8c 100644
--- a/Step/wwwroot/src/modules/alarms-list.ts
+++ b/Step/wwwroot/src/modules/alarms-list.ts
@@ -2,7 +2,7 @@ import Vue from "vue";
 import Component from "vue-class-component";
 import { Watch } from "vue-property-decorator";
 import { ModalHelper } from "./base-components";
-import { store, AppModel, AlarmModel, alarmsModelActions } from "src/store";
+import { store, AppModel, AlarmModel, alarmsModelActions,appModelActions } from "src/store";
 import { alarmItem, alarmDetail } from "./alarms";
 import moment from "moment";
 import { Hub } from "src/services/hub";
@@ -124,10 +124,9 @@ export default class alarmsList extends Vue {
 
 
   public selectMaintenance(m){
-    console.log(m);
-    console.log(this.$route.path);
+    
+    appModelActions.MainViewLiftDown(this.$store);
     this.$router.push({ name: 'maintenance', params: {id: m.id }});
-    console.log(this.$route.path);
     alarmsModelActions.toggleServiceClosed(store,false);
   }