diff --git a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
index 9ddb13639c..7ff7c8413b 100644
--- a/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
+++ b/BizHawk.Emulation/Consoles/Nintendo/NES/NES.cs
@@ -489,6 +489,8 @@ namespace BizHawk.Emulation.Consoles.Nintendo
 			ser.Sync("ram", ref ram, false);
 			ser.Sync("CIRAM", ref CIRAM, false);
 			ser.Sync("cpu_accumulate", ref cpu_accumulate);
+            string inp = GetControllersAsMnemonic();
+            ser.SyncFixedString("input", ref inp, 32);
 			board.SyncState(ser);
 			ppu.SyncState(ser);
 			ser.EndSection();
diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index 8467243c5f..dcef6d64bc 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -35,6 +35,7 @@ namespace BizHawk.MultiClient
 		int runloop_fps;
 		bool runloop_frameadvance;
 		DateTime runloop_second;
+        public string wasPressed = "";  //Last frame mnemonic
 		
 		Throttle throttle = new Throttle();
 		int rewindCredits;
@@ -914,6 +915,7 @@ namespace BizHawk.MultiClient
 						UnpauseEmulator();
 					}
 				}
+                wasPressed = Global.Emulator.GetControllersAsMnemonic();
 			}
 			else
 			{
diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs
index 74af916efa..2db92b5d1d 100644
--- a/BizHawk.MultiClient/RenderPanel.cs
+++ b/BizHawk.MultiClient/RenderPanel.cs
@@ -267,8 +267,10 @@ namespace BizHawk.MultiClient
             }
             if (Global.Config.DisplayInput)
             {
-                string input = MakeInputDisplay();
-                MessageFont.DrawString(null, input, Global.Config.DispInpx+1, Global.Config.DispInpy+1, new Color4(Color.Black));
+                string input = MakeLastInputDisplay();
+                MessageFont.DrawString(null, input, Global.Config.DispInpx+2, Global.Config.DispInpy+2, new Color4(Color.Black));
+                MessageFont.DrawString(null, input, Global.Config.DispInpx+1, Global.Config.DispInpy+1, Color.FromArgb(Global.Config.MessagesColor));
+                input = MakeInputDisplay();
                 MessageFont.DrawString(null, input, Global.Config.DispInpx, Global.Config.DispInpy, Color.FromArgb(Global.Config.MessagesColor));
             }
 
@@ -357,6 +359,14 @@ namespace BizHawk.MultiClient
             tmp = tmp.Replace("|", "");
             return tmp;
         }
+
+        public string MakeLastInputDisplay()
+        {
+            string tmp = Global.MainForm.wasPressed;
+            tmp = tmp.Replace(".", " ");
+            tmp = tmp.Replace("|", "");
+            return tmp;
+        }
     }
 
     class UIMessage