--- a/src/main.cpp	Wed Mar 25 14:25:21 2015 +0100
+++ b/src/main.cpp	Thu Mar 26 16:30:18 2015 +0100
@@ -161,12 +161,14 @@
     MainWindow mainWin;
 
     const QStringList args = parser.positionalArguments();
-    if (args.isEmpty() || args.size() > 1) {
+    if (args.size() > 1) {
         parser.showHelp(1);
     }
-    mainWin.setFolder(args.first());
-
-    mainWin.show();
+    if (args.size() == 1) {
+        mainWin.setFolder(args.first());
+    } else {
+        mainWin.showWithFolderSelect();
+    }
 
     return app.exec(); /* Go event loop */
 }