diff --git a/src/application.js b/src/application.js
index 300d099de98c3f52e8ce20b0363a76b90b8b5e3a..ed985dbbb31d337911dada325d698b7b3f5c1ec2 100644
--- a/src/application.js
+++ b/src/application.js
@@ -51,6 +51,9 @@ var Application = GObject.registerClass({
         this.add_main_option('version', 0,
                              GLib.OptionFlags.NONE, GLib.OptionArg.NONE,
                              _("Print version and exit"), null);
+        this.add_main_option('quit', 0,
+                             GLib.OptionFlags.NONE, GLib.OptionArg.NONE,
+                             _("Quit Polari"), null)
         this.connect('handle-local-options', (o, dict) => {
             let v = dict.lookup_value('test-instance', null);
             if (v && v.get_boolean())
@@ -74,6 +77,12 @@ var Application = GObject.registerClass({
                 return 0;
             }
 
+            v = dict.lookup_value('quit', null);
+            if (v && v.get_boolean()) {
+                this.activate_action('quit', null);
+                return 0;
+            }
+
             return -1;
         });
     }