diff --git a/src/helpers.cpp b/src/helpers.cpp
index 7d48d387..3de85c74 100644
--- a/src/helpers.cpp
+++ b/src/helpers.cpp
@@ -107,7 +107,19 @@ void ParseArgv(int argc, char **argv)
 		}
 		else if (strcmp(argv[i], "toggle") == 0)
 		{
-			Mpd->Execute("pause\n");
+			Mpd->UpdateStatus();
+			switch (Mpd->GetState())
+			{
+				case psPause:
+				case psPlay:
+					Mpd->Pause();
+					break;
+				case psStop:
+					Mpd->Play();
+					break;
+				default:
+					break;
+			}
 			quit = 1;
 		}
 		else if (strcmp(argv[i], "stop") == 0)