diff --git a/indimpc.py b/indimpc.py
index 3cb6cad..f8974f4 100755
--- a/indimpc.py
+++ b/indimpc.py
@@ -447,9 +447,14 @@ def launch_player(self, *args):
 		self.notify()
 
 if __name__ == "__main__":
-	if "-p" in sys.argv:
-		IndiMPCPreferencesDialog()
-	else:
-		indimpc = IndiMPDClient()
-		gtk.quit_add(0, indimpc.close)
+	for args in sys.argv:
+		if args == "-p":
+			IndiMPCPreferencesDialog()
+		elif args == "-s":
+			indimpc = IndiMPDClient()
+			indimpc.status_loop()
+			sys.exit()
+
+	indimpc = IndiMPDClient()
+	gtk.quit_add(0, indimpc.close)
 	gtk.main()