diff --git a/stand/forth/efi.4th b/stand/forth/efi.4th
index ce7da92b3e2b..8b58aee1ea46 100644
--- a/stand/forth/efi.4th
+++ b/stand/forth/efi.4th
@@ -26,5 +26,16 @@
 
 only forth definitions
 
-s" efi-autoresizecons" evaluate
+: efiboot? ( -- flag )
+	s" efi-version" getenv -1 <> dup if
+		swap drop ( c-addr flag -- flag )
+	then
+;
+
+: maybe-efi-resizecons
+	efiboot? if
+		s" efi-autoresizecons" evaluate
+	then
+;
+
 .( EFI boot environment) cr
diff --git a/stand/forth/loader.4th b/stand/forth/loader.4th
index 9486237b8a93..6c2f7b378f6b 100644
--- a/stand/forth/loader.4th
+++ b/stand/forth/loader.4th
@@ -46,9 +46,6 @@ include /boot/support.4th
 include /boot/color.4th
 include /boot/delay.4th
 include /boot/check-password.4th
-s" efi-version" getenv? [if]
-	include /boot/efi.4th
-[then]
 
 only forth definitions
 
diff --git a/stand/forth/loader.rc b/stand/forth/loader.rc
index 0bc66579cd0f..d898a7de6354 100644
--- a/stand/forth/loader.rc
+++ b/stand/forth/loader.rc
@@ -6,12 +6,15 @@
 \
 \ Includes additional commands
 include /boot/loader.4th
+include /boot/efi.4th
 try-include /boot/loader.rc.local
 
 \ Reads and processes loader.conf variables
 \ NOTE: Change to `initialize' if you enable the below boot menu
 start
 
+maybe-efi-resizecons
+
 \ Tests for password -- executes autoboot first if a password was defined
 check-password
 
diff --git a/stand/i386/loader/loader.rc b/stand/i386/loader/loader.rc
index 287c05efdfed..9f1ebe635971 100644
--- a/stand/i386/loader/loader.rc
+++ b/stand/i386/loader/loader.rc
@@ -3,11 +3,14 @@
 \
 \ Includes additional commands
 include /boot/loader.4th
+include /boot/efi.4th
 try-include /boot/loader.rc.local
 
 \ Reads and processes loader.conf variables
 initialize
 
+maybe-efi-resizecons
+
 \ Tests for password -- executes autoboot first if a password was defined
 check-password