diff --git a/BizHawk.MultiClient/Global.cs b/BizHawk.MultiClient/Global.cs
index 6539765dc4..76b8b2b4d5 100644
--- a/BizHawk.MultiClient/Global.cs
+++ b/BizHawk.MultiClient/Global.cs
@@ -118,7 +118,7 @@ namespace BizHawk.MultiClient
 		public static readonly Dictionary<string, Dictionary<string, string>> COMMANDS = new Dictionary<string, Dictionary<string, string>>()
 		{
 			{"Atari 2600 Basic Controller", new Dictionary<string, string>() {{"Reset", "r"}, {"Select", "s"}}},
-			{"Gameboy Controller", new Dictionary<string, string>() {}},
+			{"Gameboy Controller", new Dictionary<string, string>() {{"Reset", "r"}}},
 			{"Genesis 3-Button Controller", new Dictionary<string, string>() {}},
 			{"NES Controller", new Dictionary<string, string>() {{"Reset", "r"}}},
 			{"SNES Controller", new Dictionary<string, string>() {{"Reset", "r"}}},
diff --git a/BizHawk.MultiClient/movie/InputAdapters.cs b/BizHawk.MultiClient/movie/InputAdapters.cs
index 4ccc1ef42f..0d026eec8d 100644
--- a/BizHawk.MultiClient/movie/InputAdapters.cs
+++ b/BizHawk.MultiClient/movie/InputAdapters.cs
@@ -395,7 +395,7 @@ namespace BizHawk.MultiClient
 			StringBuilder input = new StringBuilder("|");
 
 			if (
-				ControlType == "Genesis 3-Button Controller" || ControlType == "Gameboy Controller" ||
+				ControlType == "Genesis 3-Button Controller" || // ControlType == "Gameboy Controller" ||
 				ControlType == "PC Engine Controller"
 			)
 			{
@@ -406,7 +406,7 @@ namespace BizHawk.MultiClient
 				input.Append(IsBasePressed("Reset") ? "r" : ".");
 				input.Append(IsBasePressed("Select") ? "s" : ".");
 			}
-			if (ControlType == "NES Controller")
+			if (ControlType == "NES Controller" || ControlType == "Gameboy Controller")
 			{
 				input.Append(IsBasePressed("Reset") ? Global.COMMANDS[ControlType]["Reset"] : ".");
 			}
@@ -645,6 +645,11 @@ namespace BizHawk.MultiClient
 				if (mnemonic.Length < 2) return;
 				Force("Reset", mnemonic[1] != '.' && mnemonic[1] != '0' && mnemonic[1] != 'l');
 			}
+			if (ControlType == "Gameboy Controller")
+			{
+				if (mnemonic.Length < 2) return;
+				Force("Reset", mnemonic[1] != '.');
+			}
 			if (ControlType == "SMS Controller" || ControlType == "TI83 Controller")
 			{
 				start = 1;