diff --git a/ui/src/config/section/infra.js b/ui/src/config/section/infra.js
index 727018c0e95..7f94c34f131 100644
--- a/ui/src/config/section/infra.js
+++ b/ui/src/config/section/infra.js
@@ -16,6 +16,7 @@ export default {
           icon: 'plus',
           label: 'Add Zone',
           listView: true,
+          popup: true,
           component: () => import('@/views/infra/ZoneWizard.vue')
         }
       ]
diff --git a/ui/src/views/AutogenView.vue b/ui/src/views/AutogenView.vue
index 61ec6e5a17a..6c7a614e365 100644
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@ -90,16 +90,16 @@
           :visible="showAction"
           :closable="true"
           style="top: 20px;"
-          @ok="handleSubmit"
           @cancel="closeAction"
           :confirmLoading="currentAction.loading"
+          :footer="null"
           centered
         >
           <component :is="currentAction.component"/></component>
         </a-modal>
       </keep-alive>
-
       <a-modal
+        v-else
         :title="currentAction.label"
         :visible="showAction"
         :closable="true"
@@ -369,7 +369,7 @@ export default {
       this.currentAction = {}
     },
     execAction (action) {
-      if (action.component && action.api) {
+      if (action.component && action.api && !action.popup) {
         this.$router.push({ name: action.api })
         return
       }