diff --git a/data/translations/english.trans b/data/translations/english.trans
index d20af9f..e5cd8fe 100644
--- a/data/translations/english.trans
+++ b/data/translations/english.trans
@@ -361,6 +361,8 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="Install Display Server"
 _InstGrMenuDSBody="In addition to xorg and wayland options, drivers for input devices (xf86-input-) are also listed."
 _InstGrMenuDD="Install Display Driver"
+_WarnInstGr="No Display Driver selected."                    # translate me!
+_WarnInstGr="No Display Driver selected."
 _InstDEStable="Install Manjaro Desktop (stable profiles)"
 _InstDEGit="Install Manjaro Desktop (development profiles)"
 _InstDE="Install unconfigured desktop environments"
diff --git a/data/translations/french.trans b/data/translations/french.trans
index 0b758be..1184c15 100644
--- a/data/translations/french.trans
+++ b/data/translations/french.trans
@@ -363,6 +363,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="Installer le serveur d'affichage"
 _InstGrMenuDSBody="En complément des options xorg et wayland, les pilotes pour les périphériques d'entrée (xf86-input-) sont également référencés."
 _InstGrMenuDD="Installer le pilote d'affichage"
+_WarnInstGr="No Display Driver selected."                    # translate me!
 _InstDEStable="Installer bureau Manjaro (profils stable)"
 _InstDEGit="Installer bureau Manjaro (profils de développement)"
 _InstGrDE="Installer l'environnement de bureau"
diff --git a/data/translations/german.trans b/data/translations/german.trans
index 546e546..4f75f8c 100644
--- a/data/translations/german.trans
+++ b/data/translations/german.trans
@@ -361,6 +361,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="Install Display Server"
 _InstGrMenuDSBody="In addition to xorg and wayland options, drivers for input devices (xf86-input-) are also listed."
 _InstGrMenuDD="Install Display Driver"
+_WarnInstGr="No Display Driver selected."                    # translate me!
 _InstDEStable="Install Manjaro Desktop (stable profiles)"
 _InstDEGit="Install Manjaro Desktop (development profiles)"
 _InstGrDE="Install Desktop environment"                      # translate me!
diff --git a/data/translations/hungarian.trans b/data/translations/hungarian.trans
index 35c34d0..e9b3c4e 100644
--- a/data/translations/hungarian.trans
+++ b/data/translations/hungarian.trans
@@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="X szerver telepítése"
 _InstGrMenuDSBody="A 'xorg' és 'wayland' lehetőségek mellett , a beviteli eszközök illesztőprogramjai (xf86-input-) is szerepelnek a listán."
 _InstGrMenuDD="Megjelenítő meghajtóprogramok  telepítése"
+_WarnInstGr="No Display Driver selected."                    # translate me!
 _InstDEStable="Install Manjaro Desktop (stable profiles)"    # translate me!
 _InstDEGit="Install Manjaro Desktop (development profiles)"  # translate me!
 _InstGrDE="Install Desktop environment"                      # translate me!
diff --git a/data/translations/italian.trans b/data/translations/italian.trans
index e2369d5..ed028b3 100644
--- a/data/translations/italian.trans
+++ b/data/translations/italian.trans
@@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="Installa Display Server"
 _InstGrMenuDSBody="In aggiunta alle opzioni xorg e wayland, vengono mostrati drivers per dispositivi di input (xf86-input-)."
 _InstGrMenuDD="Installazione Display Driver"
+_WarnInstGr="No Display Driver selected."                    # translate me!
 _InstDEStable="Install Manjaro Desktop (stable profiles)"    # translate me!
 _InstDEGit="Install Manjaro Desktop (development profiles)"  # translate me!
 _InstGrDE="Install Desktop environment"                      # translate me!
diff --git a/data/translations/portuguese.trans b/data/translations/portuguese.trans
index 2f59e47..e553e14 100644
--- a/data/translations/portuguese.trans
+++ b/data/translations/portuguese.trans
@@ -361,6 +361,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="Instalar Servidor de Exibição"
 _InstGrMenuDSBody="Além das opções xorg e wayland, drivers para dispositivos de entrada (xf86-input-) também são listados."
 _InstGrMenuDD="Instalar Driver de Vídeo"
+_WarnInstGr="No Display Driver selected."                    # translate me!
 _InstDEStable="Install Manjaro Desktop (stable profiles)"    # translate me!
 _InstDEGit="Install Manjaro Desktop (development profiles)"  # translate me!
 _InstGrDE="Install Desktop environment"                      # translate me!
diff --git a/data/translations/portuguese_brasil.trans b/data/translations/portuguese_brasil.trans
index 2bf03ae..74b6ff8 100644
--- a/data/translations/portuguese_brasil.trans
+++ b/data/translations/portuguese_brasil.trans
@@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="Instalar servidor de exibição"
 _InstGrMenuDSBody="Além das opções xorg e wayland, drivers para dispositivos de entrada (xf86-input-*) são fornecidos."
 _InstGrMenuDD="Instalar driver de vídeo"
+_WarnInstGr="No Display Driver selected."                    # translate me!
 _InstDEStable="Install Manjaro Desktop (stable profiles)"    # translate me!
 _InstDEGit="Install Manjaro Desktop (development profiles)"  # translate me!
 _InstGrDE="Install Desktop environment"                      # translate me!
diff --git a/data/translations/russian.trans b/data/translations/russian.trans
index 9e7ff40..c725955 100644
--- a/data/translations/russian.trans
+++ b/data/translations/russian.trans
@@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="Установка оконного сервера"
 _InstGrMenuDSBody="В дополнение к xorg и wayland, в список включены драйвера для устройств ввода (xf86-input-)."
 _InstGrMenuDD="Установка графического драйвера"
+_WarnInstGr="No Display Driver selected."                    # translate me!
 _InstDEStable="Установить рабочий стол Манджаро (стабильные профили)"
 _InstDEGit="Установить рабочий стол Манджаро (профили в разработке)"
 _InstGrDE="Install Desktop environment"                      # translate me!
diff --git a/data/translations/spanish.trans b/data/translations/spanish.trans
index eba666c..bb25b6b 100644
--- a/data/translations/spanish.trans
+++ b/data/translations/spanish.trans
@@ -362,6 +362,7 @@ _InstDEMenuTitle="Choose a full Manjaro edition or vanilla desktop environments"
 _InstGrMenuDS="Instalar servidor de pantalla"
 _InstGrMenuDSBody="Además de las opciones 'xorg' y 'wayland', también se proporcionan drivers para dispositivos de entrada (xf86-input)."
 _InstGrMenuDD="Instalar driver de pantalla"
+_WarnInstGr="No Display Driver selected."                    # translate me!
 _InstDEStable="Install Manjaro Desktop (stable profiles)"    # translate me!
 _InstDEGit="Install Manjaro Desktop (development profiles)"  # translate me!
 _InstGrDE="Install Desktop environment"                      # translate me!
diff --git a/lib/util-base.sh b/lib/util-base.sh
index 0554aa5..0fa668a 100644
--- a/lib/util-base.sh
+++ b/lib/util-base.sh
@@ -537,21 +537,26 @@ setup_graphics_card() {
     DIALOG " Choose video-driver to be installed " --radiolist "$_InstDEBody\n\n$_UseSpaceBar" 0 0 12 \
       $(mhwd -l | awk 'FNR>4 {print $1}' | awk 'NF' |awk '$0=$0" - off"')  2> /tmp/.driver || return 0
 
-    clear
-    arch_chroot "mhwd -f -i pci $(cat /tmp/.driver)" 2>$ERR
-    check_for_error "install $(cat /tmp/.driver)" $?
-
-    GRAPHIC_CARD=$(lspci | grep -i "vga" | sed 's/.*://' | sed 's/(.*//' | sed 's/^[ \t]*//')
-
-    # All non-NVIDIA cards / virtualisation
-    if [[ $(echo $GRAPHIC_CARD | grep -i 'intel\|lenovo') != "" ]]; then
-        install_intel
-    elif [[ $(echo $GRAPHIC_CARD | grep -i 'ati') != "" ]]; then
-        install_ati
-    elif [[ $(cat /tmp/.driver) == "video-nouveau" ]]; then
-        sed -i 's/MODULES=""/MODULES="nouveau"/' ${MOUNTPOINT}/etc/mkinitcpio.conf
+    if [[ $(cat /tmp/.driver) != "" ]]; then
+        clear
+        arch_chroot "mhwd -f -i pci $(cat /tmp/.driver)" 2>$ERR
+        check_for_error "install $(cat /tmp/.driver)" $?
+
+        GRAPHIC_CARD=$(lspci | grep -i "vga" | sed 's/.*://' | sed 's/(.*//' | sed 's/^[ \t]*//')
+
+        # All non-NVIDIA cards / virtualisation
+        if [[ $(echo $GRAPHIC_CARD | grep -i 'intel\|lenovo') != "" ]]; then
+            install_intel
+        elif [[ $(echo $GRAPHIC_CARD | grep -i 'ati') != "" ]]; then
+            install_ati
+        elif [[ $(cat /tmp/.driver) == "video-nouveau" ]]; then
+            sed -i 's/MODULES=""/MODULES="nouveau"/' ${MOUNTPOINT}/etc/mkinitcpio.conf
+        fi
+        check_for_error "$FUNCNAME $(cat /tmp/.driver)" "$?"
+    else
+        DIALOG " $_ErrTitle " --msgbox "$_WarnInstGr" 0 0
+        check_for_error "No video-driver selected."
     fi
-    check_for_error "$FUNCNAME $(cat /tmp/.driver)" "$?"
 }
 
 install_intel() {