diff --git a/Source/Core/Controls/ThingInfoPanel.cs b/Source/Core/Controls/ThingInfoPanel.cs
index 9c6e88ce4980949f76f015b1008404a2b279dc88..186da8fceebd0169beda52ed21dabeca7f7f195b 100644
--- a/Source/Core/Controls/ThingInfoPanel.cs
+++ b/Source/Core/Controls/ThingInfoPanel.cs
@@ -145,8 +145,8 @@ namespace CodeImp.DoomBuilder.Controls
 			}
 
 			// Arguments
-			ArgumentInfo[] arginfo = ((t.Action == 0 && ti.Args[0] != null) ? ti.Args : act.Args); //mxd
-			ArgumentInfo[] stringarginfo = ti.StringArgs;
+			ArgumentInfo[] arginfo = (t.Action == 0 && ti.Args[0] != null) ? ti.Args : act.Args; //mxd
+			ArgumentInfo[] stringarginfo = ti.StringArgs[0] != null ? ti.StringArgs : act.StringArgs;
 
             //mxd. ACS script argument names
             bool isacsscript = (Array.IndexOf(GZGeneral.ACS_SPECIALS, t.Action) != -1);