diff --git a/install.sh b/install.sh
index f18eea5..2d5b872 100755
--- a/install.sh
+++ b/install.sh
@@ -158,6 +158,14 @@ install() {
           #Append GRUB_FONT
           echo "GRUB_FONT=/boot/grub2/fonts/unicode.pf2" >> /etc/default/grub
         fi
+      elif [[ -f "/boot/efi/EFI/fedora/fonts/unicode.pf2" ]]; then
+        if grep "GRUB_FONT=" /etc/default/grub 2>&1 >/dev/null; then
+          #Replace GRUB_FONT
+          sed -i "s|.*GRUB_FONT=.*|GRUB_FONT=/boot/efi/EFI/fedora/fonts/unicode.pf2|" /etc/default/grub
+        else
+          #Append GRUB_FONT
+          echo "GRUB_FONT=/boot/efi/EFI/fedora/fonts/unicode.pf2" >> /etc/default/grub
+        fi
       fi
     fi
 
@@ -325,6 +333,8 @@ run_dialog() {
         5) screen="ultrawide2k" ;;
         *) operation_canceled   ;;
      esac
+
+     clear
   fi
 }
 
@@ -342,9 +352,13 @@ updating_grub() {
   elif has_command zypper || has_command transactional-update; then
     grub2-mkconfig -o /boot/grub2/grub.cfg
   # Check for Fedora (regular or Atomic)
-  elif has_command dnf || has_command rpm-ostree; then 
-    #Check for BIOS
-    if [[ -f /boot/grub2/grub.cfg ]]; then
+  elif has_command dnf || has_command rpm-ostree; then
+    # Check for UEFI
+    if [[ -f /boot/efi/EFI/fedora/grub.cfg ]]; then
+      prompt -s "Find config file on /boot/efi/EFI/fedora/grub.cfg ...\n"
+      grub2-mkconfig -o /boot/efi/EFI/fedora/grub.cfg
+    # Check for BIOS
+    elif [[ -f /boot/grub2/grub.cfg ]]; then
       prompt -s "Find config file on /boot/grub2/grub.cfg ...\n"
       grub2-mkconfig -o /boot/grub2/grub.cfg
     fi