diff --git a/common/bootcommand/usb_driver.go b/common/bootcommand/usb_driver.go
index c3eeeabc4..519c28525 100644
--- a/common/bootcommand/usb_driver.go
+++ b/common/bootcommand/usb_driver.go
@@ -36,6 +36,7 @@ func NewUSBDriver(send SendUsbScanCodes, interval time.Duration) *usbDriver {
 
 	special := map[string]key.Code{
 		"enter":      key.CodeReturnEnter,
+		"return":     key.CodeReturnEnter,
 		"esc":        key.CodeEscape,
 		"bs":         key.CodeDeleteBackspace,
 		"del":        key.CodeDeleteForward,
@@ -67,6 +68,9 @@ func NewUSBDriver(send SendUsbScanCodes, interval time.Duration) *usbDriver {
 		"rightalt":   key.CodeRightAlt,
 		"rightctrl":  key.CodeRightControl,
 		"rightshift": key.CodeRightShift,
+		"leftsuper":  key.CodeLeftGUI,
+		"rightsuper": key.CodeRightGUI,
+		"spacebar":   key.CodeSpacebar,
 	}
 
 	scancodeIndex := make(map[string]key.Code)
diff --git a/common/bootcommand/usb_driver_test.go b/common/bootcommand/usb_driver_test.go
index dfa85f7d1..a25948940 100644
--- a/common/bootcommand/usb_driver_test.go
+++ b/common/bootcommand/usb_driver_test.go
@@ -29,6 +29,21 @@ func TestUSBDriver(t *testing.T) {
 			key.CodeLeftShift,
 			true,
 		},
+		{
+			"<leftsuper>",
+			key.CodeLeftGUI,
+			false,
+		},
+		{
+			"<spacebar>",
+			key.CodeSpacebar,
+			false,
+		},
+		{
+			"<return>",
+			key.CodeReturnEnter,
+			false,
+		},
 		{
 			"a",
 			key.CodeA,