diff --git a/BizHawk.Client.EmuHawk/MainForm.Designer.cs b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
index 287f4f921d..67c1e2d9af 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Designer.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Designer.cs
@@ -266,6 +266,7 @@
 			this.toolStripSeparator33 = new System.Windows.Forms.ToolStripSeparator();
 			this.GBAcoresettingsToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
 			this.PSXSubMenu = new System.Windows.Forms.ToolStripMenuItem();
+			this.PSXControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.PSXOptionsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.PSXDiscControlsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.SNESSubMenu = new System.Windows.Forms.ToolStripMenuItem();
@@ -380,7 +381,6 @@
 			this.ClearSRAMContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.ShowMenuContextMenuSeparator = new System.Windows.Forms.ToolStripSeparator();
 			this.ShowMenuContextMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-			this.PSXControllerSettingsMenuItem = new System.Windows.Forms.ToolStripMenuItem();
 			this.MainformMenu.SuspendLayout();
 			this.MainStatusBar.SuspendLayout();
 			this.MainFormContextMenu.SuspendLayout();
@@ -2394,6 +2394,15 @@
 			this.PSXSubMenu.Name = "PSXSubMenu";
 			this.PSXSubMenu.Size = new System.Drawing.Size(39, 19);
 			this.PSXSubMenu.Text = "PSX";
+			this.PSXSubMenu.DropDownOpened += new System.EventHandler(this.PSXSubMenu_DropDownOpened);
+			// 
+			// PSXControllerSettingsMenuItem
+			// 
+			this.PSXControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
+			this.PSXControllerSettingsMenuItem.Name = "PSXControllerSettingsMenuItem";
+			this.PSXControllerSettingsMenuItem.Size = new System.Drawing.Size(172, 22);
+			this.PSXControllerSettingsMenuItem.Text = "Controller Settings";
+			this.PSXControllerSettingsMenuItem.Click += new System.EventHandler(this.PSXControllerSettingsMenuItem_Click);
 			// 
 			// PSXOptionsMenuItem
 			// 
@@ -3353,14 +3362,6 @@
 			this.ShowMenuContextMenuItem.Text = "Show Menu";
 			this.ShowMenuContextMenuItem.Click += new System.EventHandler(this.ShowMenuContextMenuItem_Click);
 			// 
-			// PSXControllerSettingsMenuItem
-			// 
-			this.PSXControllerSettingsMenuItem.Image = global::BizHawk.Client.EmuHawk.Properties.Resources.GameController;
-			this.PSXControllerSettingsMenuItem.Name = "PSXControllerSettingsMenuItem";
-			this.PSXControllerSettingsMenuItem.Size = new System.Drawing.Size(172, 22);
-			this.PSXControllerSettingsMenuItem.Text = "Controller Settings";
-			this.PSXControllerSettingsMenuItem.Click += new System.EventHandler(this.PSXControllerSettingsMenuItem_Click);
-			// 
 			// MainForm
 			// 
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index e5787a3552..896b81d2d1 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1277,6 +1277,10 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		private void barcodeReaderToolStripMenuItem_Click(object sender, EventArgs e)
+		{
+			GlobalWin.Tools.Load<BarcodeEntry>();
+		}
 
 		#endregion
 
@@ -1640,6 +1644,20 @@ namespace BizHawk.Client.EmuHawk
 
 		#endregion
 
+		#region PSX
+
+		private void PSXSubMenu_DropDownOpened(object sender, EventArgs e)
+		{
+			PSXControllerSettingsMenuItem.Enabled = !Global.MovieSession.Movie.IsActive;
+		}
+
+		private void PSXControllerSettingsMenuItem_Click(object sender, EventArgs e)
+		{
+			new PSXControllerConfig().ShowDialog();
+		}
+
+		#endregion
+
 		#region SNES
 
 		private void SNESSubMenu_DropDownOpened(object sender, EventArgs e)
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index db23bf3bc4..db0f0a0fd5 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -3727,11 +3727,6 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
-		private void barcodeReaderToolStripMenuItem_Click(object sender, EventArgs e)
-		{
-			GlobalWin.Tools.Load<BarcodeEntry>();
-		}
-
 		private void FeaturesMenuItem_Click(object sender, EventArgs e)
 		{
 			GlobalWin.Tools.Load<CoreFeatureAnalysis>();
@@ -3741,10 +3736,5 @@ namespace BizHawk.Client.EmuHawk
 		{
 			FeaturesMenuItem.Visible = VersionInfo.DeveloperBuild;
 		}
-
-		private void PSXControllerSettingsMenuItem_Click(object sender, EventArgs e)
-		{
-			new PSXControllerConfig().ShowDialog();
-		}
 	}
 }