diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 1a3b9fe..c284a1c 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -333,9 +333,17 @@ void RetroFE::run( )
         SDL_Event e;
         if ( splashMode && SDL_PollEvent( &e ) )
         {
-            if ( input_.update( e ) )
+            if ( input_.update( e ) && input_.keystate(UserInput::KeyCodeSelect) )
             {
                 exitSplashMode = true;
+                while ( SDL_PollEvent( &e ) )
+                {
+                    if ( e.type == SDL_JOYDEVICEADDED || e.type == SDL_JOYDEVICEREMOVED )
+                    {
+                        input_.update( e );
+                    }
+                }
+                input_.resetStates( );
                 attract_.reset( );
             }
         }
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 4f3fd9a..690c2c1 100644
--- a/RetroFE/Source/Version.cpp
+++ b/RetroFE/Source/Version.cpp
@@ -21,7 +21,7 @@
 
 std::string retrofe_version_major = "0";
 std::string retrofe_version_minor = "8";
-std::string retrofe_version_build = "15b4";
+std::string retrofe_version_build = "15b5";
 
 
 std::string Version::getString( )