diff --git a/RetroFE/Source/RetroFE.cpp b/RetroFE/Source/RetroFE.cpp
index fd3267e..96f7365 100644
--- a/RetroFE/Source/RetroFE.cpp
+++ b/RetroFE/Source/RetroFE.cpp
@@ -704,6 +704,24 @@ bool RetroFE::run( )
             else // Not in a collection
             {
                 state = RETROFE_COLLECTION_DOWN_ENTER;
+
+                if ( attractMode_ ) // Check playlist change in attract mode
+				{
+					attractModePlaylistCollectionNumber_   += 1;
+					int attractModePlaylistCollectionNumber = 0;
+					config_.getProperty( "attractModePlaylistCollectionNumber", attractModePlaylistCollectionNumber );
+					// Check if playlist should be changed
+					if ( attractModePlaylistCollectionNumber_ > 0 && attractModePlaylistCollectionNumber_ >= attractModePlaylistCollectionNumber )
+					{
+						attractModePlaylistCollectionNumber_ = 0;
+                        currentPage_->nextPlaylist( );
+                        std::string attractModeSkipPlaylist = "";
+                        config_.getProperty( "attractModeSkipPlaylist", attractModeSkipPlaylist );
+                        if (currentPage_->getPlaylistName( ) == attractModeSkipPlaylist)
+                            currentPage_->nextPlaylist( );
+						state = RETROFE_PLAYLIST_REQUEST;
+					}
+				}
             }
             break;
 
diff --git a/RetroFE/Source/Version.cpp b/RetroFE/Source/Version.cpp
index 9cef966..cff9c22 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 = "37";
+std::string retrofe_version_build = "38";
 
 
 std::string Version::getString( )