diff --git a/AUTHORS b/AUTHORS
index 912d48da7..1c4d7aa24 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -38,6 +38,7 @@ and moral support from (alphabetically by first name or nickname):
  - Kevin Kofler
  - Kyle Robertze
  - Lisa Vitolo
+ - Neal Gompa
  - n3rdopolis
  - Philip Müller
  - Ramon Buldó
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index ec9a6f2e6..03fdb0c5b 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -14,6 +14,7 @@
 #   SPDX-FileCopyrightText: 2017-2019 Adriaan de Groot <groot@kde.org>
 #   SPDX-FileCopyrightText: 2017 Gabriel Craciunescu <crazy@frugalware.org>
 #   SPDX-FileCopyrightText: 2017 Ben Green <Bezzy1999@hotmail.com>
+#   SPDX-FileCopyrightText: 2021 Neal Gompa <ngompa13@gmail.com>
 #   SPDX-License-Identifier: GPL-3.0-or-later
 #
 #   Calamares is Free Software: see the License-Identifier above.
@@ -372,9 +373,9 @@ def install_secureboot(efi_directory):
     install_efi_directory = install_path + efi_directory
 
     if efi_word_size() == "64":
-        install_efi_bin = "shim64.efi"
-    else:
-        install_efi_bin = "shim.efi"
+        install_efi_bin = "shimx64.efi"
+    elif efi_word_size() == "32":
+        install_efi_bin = "shimia32.efi"
 
     # Copied, roughly, from openSUSE's install script,
     # and pythonified. *disk* is something like /dev/sda,