diff --git a/BasiliskII/src/SDL/video_sdl2.cpp b/BasiliskII/src/SDL/video_sdl2.cpp
index 06717ec2..1b62dd25 100644
--- a/BasiliskII/src/SDL/video_sdl2.cpp
+++ b/BasiliskII/src/SDL/video_sdl2.cpp
@@ -2302,6 +2302,8 @@ static void handle_events(void)
 
 			// Keyboard
 			case SDL_KEYDOWN: {
+				if (event.key.repeat)
+					break;
 				int code = CODE_INVALID;
 				if (use_keycodes && event2keycode(event.key, true) != CODE_HOTKEY)
 					code = keycode_table[event.key.keysym.scancode & 0xff];
diff --git a/SheepShaver/src/prefs_items.cpp b/SheepShaver/src/prefs_items.cpp
index 5afc9e2b..b9587b28 100644
--- a/SheepShaver/src/prefs_items.cpp
+++ b/SheepShaver/src/prefs_items.cpp
@@ -103,9 +103,9 @@ void AddPrefsDefaults(void)
 
 	PrefsAddInt32("keyboardtype", 5);
 
-	#ifdef __APPLE__
-		PrefsAddBool("swap_opt_cmd", false);
-	#else
-		PrefsAddBool("swap_opt_cmd", true);
-	#endif
+#ifdef __APPLE__
+	PrefsAddBool("swap_opt_cmd", false);
+#else
+	PrefsAddBool("swap_opt_cmd", true);
+#endif
 }