diff --git a/files/setup/autodesk_fusion_installer_x86-64.sh b/files/setup/autodesk_fusion_installer_x86-64.sh
index f519d3e..e7b095f 100755
--- a/files/setup/autodesk_fusion_installer_x86-64.sh
+++ b/files/setup/autodesk_fusion_installer_x86-64.sh
@@ -446,21 +446,17 @@ function check_gpu_driver {
 
     INTEL_AMD_GPU=$(glxinfo | grep "OpenGL vendor string" | cut -d: -f2 | tr -d ' ')
 
-    AMD_GPU=$(glxinfo | grep "OpenGL vendor string" | cut -d: -f2 | tr -d ' ')
-    if [[ $AMD_GPU == "AMD" ]]; then
+    if [[ $INTEL_AMD_GPU == "AMD" ]]; then
         AMD_PRESENT=true
         AMD_VRAM=$(glxinfo | grep -i "Video memory" | grep -Eo '[0-9]+MB' | grep -Eo '[0-9]+' | head -n1)
-        echo -e "$(gettext "${GREEN}${AMD_GPU} GPU detected with ${AMD_VRAM}MB VRAM${NOCOLOR}")"
-    fi
-
-    INTEL_GPU=$(glxinfo | grep "OpenGL vendor string" | cut -d: -f2 | tr -d ' ')
-    if [[ $INTEL_GPU == "Intel" ]]; then
+        echo -e "$(gettext "${GREEN}${INTEL_AMD_GPU} GPU detected with ${AMD_VRAM}MB VRAM${NOCOLOR}")"
+    elif [[ $INTEL_AMD_GPU == "Intel" ]]; then
         INTEL_PRESENT=true
         INTEL_VRAM=$(glxinfo | grep -i "Video memory" | grep -Eo '[0-9]+MB' | grep -Eo '[0-9]+' | head -n1)
-        echo -e "$(gettext "${GREEN}${INTEL_GPU} GPU detected with ${INTEL_VRAM}MB VRAM${NOCOLOR}")"
+        echo -e "$(gettext "${GREEN}${INTEL_AMD_GPU} GPU detected with ${INTEL_VRAM}MB VRAM${NOCOLOR}")"
     fi
 
-    if [[ $NVIDIA_PRESENT && $INTEL_AMD_PRESENT ]]; then
+    if [[ $NVIDIA_PRESENT && ($INTEL_PRESENT || $AMD_PRESENT) ]]; then
         echo -e "$(gettext "${YELLOW}Multiple GPUs detected. Please choose which to use (Default is DXVK):${NOCOLOR}")"
         echo "1) NVIDIA"
         echo "2) ${INTEL_AMD_GPU}"
@@ -477,17 +473,21 @@ function check_gpu_driver {
                     GPU_DRIVER="DXVK"
                     GET_VRAM_MEGABYTES=$AMD_VRAM
                     echo -e "$(gettext "${GREEN}The OpenGL GPU driver will be used for the installation.${NOCOLOR}")"
-                else [[ $INTEL_PRESENT ]]; then
+                elif [[ $INTEL_PRESENT ]]; then
                     GPU_DRIVER="OpenGL"
                     GET_VRAM_MEGABYTES=$INTEL_VRAM
                     echo -e "$(gettext "${GREEN}The OpenGL GPU fallback driver will be used for the installation.${NOCOLOR}")"
-                    GET_VRAM_MEGABYTES=$INTEL_VRAM    
                 fi
                 ;;
             *)
                 echo -e "$(gettext "${RED}Invalid choice. Defaulting to ${INTEL_AMD_GPU} GPU.${NOCOLOR}")"
-                GPU_DRIVER="DXVK"
-                GET_VRAM_MEGABYTES=$INTEL_AMD_VRAM
+                if [[ $AMD_PRESENT ]]; then
+                    GPU_DRIVER="DXVK"
+                    GET_VRAM_MEGABYTES=$AMD_VRAM
+                else
+                    GPU_DRIVER="OpenGL"
+                    GET_VRAM_MEGABYTES=$INTEL_VRAM
+                fi
                 ;;
         esac
     elif [[ $NVIDIA_PRESENT ]]; then