diff --git a/src/showdown.vala b/src/showdown.vala
index bba36e92b5fd6e5799b457199e2a4a280207269f..b653419195f4c1cad56a5a4fc1408d0186b750e7 100644
--- a/src/showdown.vala
+++ b/src/showdown.vala
@@ -21,6 +21,7 @@ class Showdown.Application: Gtk.Application {
     };
 
     static string? wflag = null;
+    static bool minimalWindow = false;
     const OptionEntry[] options = {
         {
             "open-in-current-window", 'w', 0,
@@ -32,6 +33,11 @@ class Showdown.Application: Gtk.Application {
             OptionArg.CALLBACK, (void *)print_version_and_exit,
             "Print version number and exit", null
         },
+        {
+            "minimal-ui", 'M', 0,
+            OptionArg.NONE, ref minimalWindow,
+           "Disable window decoration", null
+        },
         {null}
     };
 
@@ -74,11 +80,13 @@ class Showdown.Application: Gtk.Application {
                 w.load_file(file.get_path());
             } else {
                 var window = new Window(this);
+                window.set_decorated(!minimalWindow);
                 window.load_file(file.get_path());
                 add_window(window);
             }
         } else {
             var window = new Window(this);
+            window.set_decorated(!minimalWindow);
             if (args.length >= 2) {
                 var file = File.new_for_commandline_arg_and_cwd(args[1], cwd);
                 window.load_file(file.get_path());