diff --git a/src/actions.cpp b/src/actions.cpp
index b44c3a73..6fc6fc1d 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -253,27 +253,6 @@ void setWindowsDimensions()
 	FooterHeight = Config.statusbar_visibility ? 2 : 1;
 }
 
-bool connectToMPD()
-{
-	try
-	{
-		Mpd.Connect();
-		if (Mpd.Version() < 16)
-		{
-			std::cout << "MPD < 0.16.0 is not supported, please upgrade\n";
-			return false;
-		}
-	}
-	catch (std::exception &e)
-	{
-		std::cout << "Couldn't connect to MPD ";
-		std::cout << "(host = " << Mpd.GetHostname() << ", port = " << Mpd.GetPort() << ")";
-		std::cout << ": " << e.what() << std::endl;
-		return false;
-	}
-	return true;
-}
-
 bool askYesNoQuestion(const std::string &question, void (*callback)())
 {
 	using Global::wFooter;
diff --git a/src/actions.h b/src/actions.h
index a26c27db..afb53823 100644
--- a/src/actions.h
+++ b/src/actions.h
@@ -65,7 +65,6 @@ void setResizeFlags();
 void resizeScreen(bool reload_main_window);
 void setWindowsDimensions();
 
-bool connectToMPD();
 bool askYesNoQuestion(const std::string &question, void (*callback)());
 bool isMPDMusicDirSet();
 
diff --git a/src/cmdargs.cpp b/src/cmdargs.cpp
index 116a7692..955ea386 100644
--- a/src/cmdargs.cpp
+++ b/src/cmdargs.cpp
@@ -121,8 +121,6 @@ void ParseArgv(int argc, char **argv)
 			exit(0);
 		}
 		
-		Actions::connectToMPD();
-		
 		if (!strcmp(argv[i], "-s") || !strcmp(argv[i], "--screen"))
 		{
 			if (++i == argc) {
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index 72d71989..96c95580 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -170,10 +170,6 @@ int main(int argc, char **argv)
 	myPlaylist->switchTo();
 	myPlaylist->UpdateTimer();
 	
-	// go to startup screen
-	if (Config.startup_screen != myScreen)
-		Config.startup_screen->switchTo();
-	
 	// local variables
 	Key input(0, Key::Standard);
 	timeval past = { 0, 0 };
@@ -213,6 +209,10 @@ int main(int argc, char **argv)
 							myPlaylist->main().highlight(curr_pos);
 					}
 					
+					// go to startup screen
+					if (Config.startup_screen != myScreen)
+						Config.startup_screen->switchTo();
+					
 					myBrowser->fetchSupportedExtensions();
 #					ifdef ENABLE_OUTPUTS
 					myOutputs->FetchList();