diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index 65ecc03..07fa4fe 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -321,6 +321,13 @@ void RetroFE::run( )
     attract_.idlePlaylistTime   = static_cast<float>(attractModePlaylistTime);
     attract_.idleCollectionTime = static_cast<float>(attractModeCollectionTime);
 
+    int fps     = 60;
+	int fpsIdle = 60;
+	config_.getProperty( "fps", fps );
+	config_.getProperty( "fpsIdle", fpsIdle );
+	double fpsTime     = 1000.0 / static_cast<double>(fps);
+	double fpsIdleTime = 1000.0 / static_cast<double>(fpsIdle);
+
     int initializeStatus = 0;
 
     // load the initial splash screen, unload it once it is complete
@@ -1181,7 +1188,11 @@ void RetroFE::run( )
             }
 
             deltaTime = currentTime_ - lastTime;
-            double sleepTime = 1000.0/60.0 - deltaTime*1000;
+            double sleepTime;
+			if (state == RETROFE_IDLE)
+				sleepTime = fpsIdleTime - deltaTime*1000;
+			else
+				sleepTime = fpsTime - deltaTime*1000;
             if ( sleepTime > 0 )
             {
                 SDL_Delay( static_cast<unsigned int>( sleepTime ) );
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 5952e0b..31d1040 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 = "9";
-std::string retrofe_version_build = "24";
+std::string retrofe_version_build = "25";
 
 
 std::string Version::getString( )