diff --git a/build.xml b/build.xml
index c0a05383..291b33b8 100644
--- a/build.xml
+++ b/build.xml
@@ -363,10 +363,6 @@
 		<create-app-bundle dir="${dir.staging}" deployment="mas" runtime="yes" license="no" identifier="${package.identifier}">
 			<option value="-Dapplication.update=skip" />
 
-			<!-- MAS does not allow subtitle apps -->
-			<argument value="--mode" />
-			<argument value="Rename|Episodes|SFV|Filter|List" />
-
 			<!-- WORKING_DIR is sandbox data folder -->
 			<option value="-Dapplication.dir=Library/Application Support/User Data" />
 			<option value="-Dapplication.cache=Library/Caches/ehcache.disk.store" />
diff --git a/source/net/filebot/Main.java b/source/net/filebot/Main.java
index a1fedfa8..d95a6a51 100644
--- a/source/net/filebot/Main.java
+++ b/source/net/filebot/Main.java
@@ -1,6 +1,7 @@
 package net.filebot;
 
 import static java.awt.GraphicsEnvironment.*;
+import static java.util.Arrays.*;
 import static java.util.stream.Collectors.*;
 import static net.filebot.Logging.*;
 import static net.filebot.MediaTypes.*;
@@ -57,7 +58,7 @@ public class Main {
 	public static void main(String[] argv) {
 		try {
 			// parse arguments
-			ArgumentBean args = new ArgumentBean(argv);
+			ArgumentBean args = isMacSandbox() ? new ArgumentBean() : new ArgumentBean(argv); // MAS does not support or allow command-line applications and may run executables with strange arguments for no apparent reason (e.g. filebot.launcher -psn_0_774333)
 
 			// just print help message or version string and then exit
 			if (args.printHelp()) {
@@ -216,10 +217,15 @@ public class Main {
 		// use native LaF an all platforms
 		setSystemLookAndFeel();
 
-		// start multi panel or single panel frame
+		// start standard frame or single panel frame
 		PanelBuilder[] panels = args.getPanelBuilders();
-		JFrame frame = panels.length > 1 ? new MainFrame(panels) : new SinglePanelFrame(panels[0]);
 
+		// MAS does not allow subtitle applications
+		if (isMacSandbox()) {
+			panels = stream(panels).filter(p -> !p.getName().equals("Subtitles")).toArray(PanelBuilder[]::new);
+		}
+
+		JFrame frame = panels.length > 1 ? new MainFrame(panels) : new SinglePanelFrame(panels[0]);
 		try {
 			restoreWindowBounds(frame, Settings.forPackage(MainFrame.class)); // restore previous size and location
 		} catch (Exception e) {
@@ -346,9 +352,7 @@ public class Main {
 	}
 
 	/**
-	 * Initialize default SecurityManager and grant all permissions via security
-	 * policy. Initialization is required in order to run {@link ExpressionFormat}
-	 * in a secure sandbox.
+	 * Initialize default SecurityManager and grant all permissions via security policy. Initialization is required in order to run {@link ExpressionFormat} in a secure sandbox.
 	 */
 	private static void initializeSecurityManager() {
 		try {
diff --git a/source/net/filebot/cli/ArgumentBean.java b/source/net/filebot/cli/ArgumentBean.java
index c4be9232..5537edf0 100644
--- a/source/net/filebot/cli/ArgumentBean.java
+++ b/source/net/filebot/cli/ArgumentBean.java
@@ -358,6 +358,10 @@ public class ArgumentBean {
 
 	private final String[] args;
 
+	public ArgumentBean() {
+		this.args = new String[0];
+	}
+
 	public ArgumentBean(String... args) throws CmdLineException {
 		this.args = args;