diff --git a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
index e02320111..d4c6707f3 100644
--- a/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
+++ b/.idea/.idea.Aaru/.idea/runConfigurations/Aaru.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Aaru" type="DotNetProject" factoryName=".NET Project">
     <option name="EXE_PATH" value="$PROJECT_DIR$/Aaru/bin/Debug/net10.0/aaru" />
-    <option name="PROGRAM_PARAMETERS" value="archive extract --help" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/Aaru/bin/Debug/net10.0" />
+    <option name="PROGRAM_PARAMETERS" value="fs --pause --logfile mylog.log ls qcow.qc.lz" />
+    <option name="WORKING_DIRECTORY" value="/mnt/AaruTests/Media image formats/QEMU/QEMU Copy On Write" />
     <option name="PASS_PARENT_ENVS" value="1" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="ENV_FILE_PATHS" value="" />
@@ -15,7 +15,7 @@
     <option name="PROJECT_PATH" value="$PROJECT_DIR$/Aaru/Aaru.csproj" />
     <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
     <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
-    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+    <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="0" />
     <option name="PROJECT_KIND" value="DotNetCore" />
     <option name="PROJECT_TFM" value="net10.0" />
     <method v="2">
diff --git a/Aaru/Commands/BaseSettings.cs b/Aaru/Commands/BaseSettings.cs
index c10a23114..76731bc08 100644
--- a/Aaru/Commands/BaseSettings.cs
+++ b/Aaru/Commands/BaseSettings.cs
@@ -19,11 +19,8 @@ public class BaseSettings : CommandSettings
     [Description("Path to log file.")]
     public string? LogFile { get; set; }
 
-    // TODO: Add support for this
-    /*
     [CommandOption("--pause")]
     [Description("Pauses before exiting.")]
     [DefaultValue(false)]
-    public bool   Pause { get; init; }
-    */
+    public bool Pause { get; init; }
 }
\ No newline at end of file
diff --git a/Aaru/Main.cs b/Aaru/Main.cs
index 81e7ced1d..2e6891a33 100644
--- a/Aaru/Main.cs
+++ b/Aaru/Main.cs
@@ -61,9 +61,10 @@ namespace Aaru;
 
 class MainClass
 {
-    static string                                _assemblyCopyright;
-    static string                                _assemblyTitle;
-    static AssemblyInformationalVersionAttribute _assemblyVersion;
+    static        string                                _assemblyCopyright;
+    static        string                                _assemblyTitle;
+    static        AssemblyInformationalVersionAttribute _assemblyVersion;
+    public static bool                                  PauseBeforeExiting { get; set; }
 
     public static async Task<int> Main([NotNull] string[] args)
     {
@@ -396,15 +397,17 @@ class MainClass
             config.AddCommand<RemoteCommand>("remote").WithAlias("rem").WithDescription(UI.Remote_Command_Description);
 
             config.SetInterceptor(new LoggingInterceptor());
+            config.SetInterceptor(new PausingInterceptor());
         });
 
         int ret = await app.RunAsync(args);
 
         await Statistics.SaveStatsAsync();
 
-        // TODO: Return pause functionality
-//        AaruConsole.WriteLine(UI.Press_any_key_to_exit);
-//        System.Console.ReadKey();
+        if(!PauseBeforeExiting) return ret;
+
+        AaruConsole.WriteLine(UI.Press_any_key_to_exit);
+        System.Console.ReadKey();
 
         return ret;
     }
diff --git a/Aaru/PausingInterceptor.cs b/Aaru/PausingInterceptor.cs
new file mode 100644
index 000000000..97745b272
--- /dev/null
+++ b/Aaru/PausingInterceptor.cs
@@ -0,0 +1,20 @@
+using Aaru.Commands;
+using Spectre.Console.Cli;
+
+namespace Aaru;
+
+public class PausingInterceptor : ICommandInterceptor
+{
+#region ICommandInterceptor Members
+
+    public void Intercept(CommandContext context, CommandSettings settings)
+    {
+        if(settings is not BaseSettings global) return;
+
+        if(global is not { Pause: true }) return;
+
+        MainClass.PauseBeforeExiting = true;
+    }
+
+#endregion
+}
\ No newline at end of file