diff --git a/scripts/gpu_tpu/add_gpu_vm.sh b/scripts/gpu_tpu/add_gpu_vm.sh
index d616aa91..ff8aac3f 100644
--- a/scripts/gpu_tpu/add_gpu_vm.sh
+++ b/scripts/gpu_tpu/add_gpu_vm.sh
@@ -1306,13 +1306,22 @@ check_switch_mode() {
         msg+="$(translate 'Choose conflict policy for the source VM:')"
 
         local vm_action_choice
-        vm_action_choice=$(dialog --backtitle "ProxMenux" --colors \
-            --title "$(translate 'GPU Already Assigned to Another VM')" \
-            --default-item "1" \
-            --menu "$msg" 24 98 8 \
-            "1" "$(translate 'Keep GPU in source VM config (disable Start on boot if enabled)')" \
-            "2" "$(translate 'Remove GPU from source VM config (keep Start on boot)')" \
-            2>&1 >/dev/tty) || exit 0
+        if [[ "$WIZARD_CALL" == "true" ]]; then
+            vm_action_choice=$(whiptail --backtitle "ProxMenux" \
+                --title "$(translate 'GPU Already Assigned to Another VM')" \
+                --menu "$msg" 24 98 8 \
+                "1" "$(translate 'Keep GPU in source VM config (disable Start on boot if enabled)')" \
+                "2" "$(translate 'Remove GPU from source VM config (keep Start on boot)')" \
+                3>&1 1>&2 2>&3) || exit 0
+        else
+            vm_action_choice=$(dialog --backtitle "ProxMenux" --colors \
+                --title "$(translate 'GPU Already Assigned to Another VM')" \
+                --default-item "1" \
+                --menu "$msg" 24 98 8 \
+                "1" "$(translate 'Keep GPU in source VM config (disable Start on boot if enabled)')" \
+                "2" "$(translate 'Remove GPU from source VM config (keep Start on boot)')" \
+                2>&1 >/dev/tty) || exit 0
+        fi
 
         case "$vm_action_choice" in
             1) SWITCH_VM_ACTION="keep_gpu_disable_onboot" ;;
@@ -1390,11 +1399,15 @@ confirm_summary() {
     local run_title
     run_title=$(_get_vm_run_title)
 
-    dialog --backtitle "ProxMenux" --colors \
-        --title "${run_title}" \
-        --yesno "$msg" 28 78
-
-    [[ $? -ne 0 ]] && exit 0
+    if [[ "$WIZARD_CALL" == "true" ]]; then
+        whiptail --backtitle "ProxMenux" --title "${run_title}" --yesno "$msg" 28 78
+        [[ $? -ne 0 ]] && exit 0
+    else
+        dialog --backtitle "ProxMenux" --colors \
+            --title "${run_title}" \
+            --yesno "$msg" 28 78
+        [[ $? -ne 0 ]] && exit 0
+    fi
 }
 
 
diff --git a/scripts/storage/add_controller_nvme_vm.sh b/scripts/storage/add_controller_nvme_vm.sh
index 3dc63296..642b1da5 100755
--- a/scripts/storage/add_controller_nvme_vm.sh
+++ b/scripts/storage/add_controller_nvme_vm.sh
@@ -293,7 +293,7 @@ select_controller_nvme() {
     fi
     dialog --backtitle "ProxMenux" \
       --title "$(translate "Controller + NVMe")" \
-      --msgbox "$msg" 22 100
+      --msgbox "$msg" 18 84
     return 1
   fi
 
diff --git a/scripts/vm/disk_selector.sh b/scripts/vm/disk_selector.sh
index 3e7714b1..3e072be9 100644
--- a/scripts/vm/disk_selector.sh
+++ b/scripts/vm/disk_selector.sh
@@ -360,7 +360,7 @@ function select_controller_nvme() {
     if [[ $blocked_count -gt 0 ]]; then
       msg+="$(translate "Hidden for safety"):\n${blocked_report}"
     fi
-    whiptail --title "Controller + NVMe" --msgbox "$msg" 22 100
+    whiptail --title "Controller + NVMe" --msgbox "$msg" 18 84
     return 1
   fi
 
diff --git a/scripts/vm/synology.sh b/scripts/vm/synology.sh
index c9eb1790..d40ce2e4 100644
--- a/scripts/vm/synology.sh
+++ b/scripts/vm/synology.sh
@@ -711,7 +711,7 @@ function select_controller_nvme() {
         msg+="$(translate "Hidden for safety"):\n${blocked_report}"
       fi
     fi
-    whiptail --title "Controller + NVMe" --msgbox "$msg" 22 100
+    whiptail --title "Controller + NVMe" --msgbox "$msg" 18 84
     return 1
   fi
 
diff --git a/scripts/vm/zimaos.sh b/scripts/vm/zimaos.sh
index 0b377060..0ee8c12b 100644
--- a/scripts/vm/zimaos.sh
+++ b/scripts/vm/zimaos.sh
@@ -725,7 +725,7 @@ function select_controller_nvme() {
         msg+="$(translate "Hidden for safety"):\n${blocked_report}"
       fi
     fi
-    whiptail --title "Controller + NVMe" --msgbox "$msg" 22 100
+    whiptail --title "Controller + NVMe" --msgbox "$msg" 18 84
     return 1
   fi