diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua
index 8b5f00847832..9c94c9b023d2 100644
--- a/stand/lua/drawer.lua
+++ b/stand/lua/drawer.lua
@@ -175,6 +175,12 @@ drawer.menu_name_handlers = {
 	-- This is designed so that everything, including menu separators, may
 	-- have their names derived differently. The default action for entry
 	-- types not specified here is to call and use entry.name().
+	[core.MENU_SEPARATOR] = function(drawing_menu, entry)
+		if entry.name ~= nil then
+			return entry.name()
+		end
+		return ""
+	end,
 	[core.MENU_CAROUSEL_ENTRY] = function(drawing_menu, entry)
 		local carid = entry.carousel_id
 		local caridx = config.getCarouselIndex(carid)
diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua
index 87b9874c4cdc..b52120522158 100644
--- a/stand/lua/menu.lua
+++ b/stand/lua/menu.lua
@@ -113,9 +113,6 @@ menu.boot_options = {
 
 		{
 			entry_type = core.MENU_SEPARATOR,
-			name = function()
-				return ""
-			end
 		},
 
 		{
@@ -269,9 +266,6 @@ menu.welcome = {
 
 		{
 			entry_type = core.MENU_SEPARATOR,
-			name = function()
-				return ""
-			end
 		},
 
 		{