diff --git a/src/ui/screen/screen_io.cpp b/src/ui/screen/screen_io.cpp
index 2f818b3e..48e6e056 100644
--- a/src/ui/screen/screen_io.cpp
+++ b/src/ui/screen/screen_io.cpp
@@ -157,7 +157,10 @@ void CScreenIO::IOUpdateList(bool isWrite)
     }
 
     if (m_saveList.size() <= static_cast<unsigned int>(sel))
+    {
+        pi->SetFilenameImage(""); // clear screenshot, nothing selected or New save selected
         return;
+    }
 
     std::string filename = m_saveList.at(sel) + "/screen.png";
     if ( isWrite )
@@ -166,10 +169,6 @@ void CScreenIO::IOUpdateList(bool isWrite)
         {
             pi->SetFilenameImage(filename.c_str());
         }
-        else
-        {
-            pi->SetFilenameImage("");
-        }
     }
     else
     {