diff --git a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
index 5044b98271..d20fea3c50 100644
--- a/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
+++ b/BizHawk.Client.EmuHawk/tools/Macros/MacroInput.cs
@@ -295,7 +295,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			return PathManager.MakeAbsolutePath(Path.Combine(
 				Global.Config.PathEntries["Global", "Macros"].Path,
-				Global.Game.Name), null);
+				PathManager.FilesystemSafeName(Global.Game)), null);
 		}
 
 		#endregion
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
index cb38859858..7deafb2f95 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.MenuItems.cs
@@ -25,6 +25,10 @@ namespace BizHawk.Client.EmuHawk
 			SaveTASMenuItem.Enabled =
 				!string.IsNullOrWhiteSpace(CurrentTasMovie.Filename) &&
 				(CurrentTasMovie.Filename != DefaultTasProjName());
+
+			saveSelectionToMacroToolStripMenuItem.Enabled =
+				placeMacroAtSelectionToolStripMenuItem.Enabled =
+				TasView.AnyRowsSelected;
 		}
 
 		private void RecentSubMenu_DropDownOpened(object sender, EventArgs e)