diff --git a/src/pse/pad.cpp b/src/pse/pad.cpp
index 1075bc594..d05c2ccca 100644
--- a/src/pse/pad.cpp
+++ b/src/pse/pad.cpp
@@ -22,6 +22,11 @@ void Pad::Reset()
 
 bool Pad::DoState(StateWrapper& sw)
 {
+  sw.Do(&m_JOY_CTRL.bits);
+  sw.Do(&m_JOY_STAT.bits);
+  sw.Do(&m_JOY_MODE.bits);
+  sw.Do(&m_RX_FIFO);
+  sw.Do(&m_TX_FIFO);
   return !sw.HasError();
 }
 
diff --git a/src/pse/pad.h b/src/pse/pad.h
index 62a3ab3f1..23235ba65 100644
--- a/src/pse/pad.h
+++ b/src/pse/pad.h
@@ -31,7 +31,7 @@ private:
 
   union JOY_CTRL
   {
-    u32 bits;
+    u16 bits;
 
     BitField<u16, bool, 0, 1> TXEN;
     BitField<u16, bool, 1, 1> SELECT;