diff --git a/src/components/ZCLToolbar.vue b/src/components/ZCLToolbar.vue
index 1e4c6d455e..aee551bbff 100644
--- a/src/components/ZCLToolbar.vue
+++ b/src/components/ZCLToolbar.vue
@@ -1,7 +1,10 @@
 <template>
   <q-toolbar
-    class="bg-glass q-electron-drag"
-    :class="{ 'window-button-padding-right': isElectron && isWin }"
+    class="bg-glass"
+    :class="{
+      'window-button-padding-right': isElectron && isWin,
+      ' q-electron-drag': !showCreateModifyEndpoint
+    }"
   >
     <q-toolbar-title
       :class="{ 'logo-margin': showPreviewTab || showNotificationTab }"
@@ -257,6 +260,11 @@ export default {
         return this.$store.state.zap.isTutorialRunning
       }
     },
+    showCreateModifyEndpoint: {
+      get() {
+        return this.$store.state.zap.showCreateModifyEndpoint
+      }
+    },
     showPreviewTab: {
       get() {
         return this.$store.state.zap.showPreviewTab
diff --git a/src/components/ZclCreateModifyEndpoint.vue b/src/components/ZclCreateModifyEndpoint.vue
index 2553c077fb..f57ad3715a 100644
--- a/src/components/ZclCreateModifyEndpoint.vue
+++ b/src/components/ZclCreateModifyEndpoint.vue
@@ -15,7 +15,7 @@ limitations under the License.
 -->
 <template>
   <div>
-    <q-card style="min-width: 450px">
+    <q-card style="min-width: 450px" class="z-top">
       <q-card-section>
         <div
           class="text-h6 flex text-align:left q-mb-sm"