diff --git a/ui/src/org/pentaho/di/ui/spoon/Spoon.java b/ui/src/org/pentaho/di/ui/spoon/Spoon.java
index 91762797cb23..77755b326616 100644
--- a/ui/src/org/pentaho/di/ui/spoon/Spoon.java
+++ b/ui/src/org/pentaho/di/ui/spoon/Spoon.java
@@ -7989,6 +7989,7 @@ public void loadLastUsedFiles() {
             || lastUsedFile.isSourceRepository() && rep != null
             && rep.getName().equals( lastUsedFile.getRepositoryName() ) ) {
             loadLastUsedFile( lastUsedFile, rep == null ? null : rep.getName(), false );
+            setLastFileOpened( lastUsedFile.getFilename() );
           }
         } catch ( Exception e ) {
           hideSplash();
diff --git a/ui/src/org/pentaho/di/ui/spoon/WebSpoonEntryPoint.java b/ui/src/org/pentaho/di/ui/spoon/WebSpoonEntryPoint.java
index 0ea32ea2d50e..5fe01251fc43 100644
--- a/ui/src/org/pentaho/di/ui/spoon/WebSpoonEntryPoint.java
+++ b/ui/src/org/pentaho/di/ui/spoon/WebSpoonEntryPoint.java
@@ -79,19 +79,12 @@ protected void createContents( Composite parent ) {
       LogChannel.GENERAL.logError( "Error calling extension points", e );
     }
 
+    // For VFS browser, set the user data directory. This will be overwritten by the last open file if exists.
+    Spoon.getInstance().setLastFileOpened( Const.getKettleUserDataDirectory() );
+
     // Load last used files
     Spoon.getInstance().loadLastUsedFiles();
 
-    // For VFS browser set the last open file if exists, otherwise set the user data directory
-    Spoon.getInstance().setLastFileOpened( Const.getKettleUserDataDirectory() );
-    List<LastUsedFile> lastUsedFiles = Spoon.getInstance().getProperties().getOpenTabFiles();
-    if ( lastUsedFiles.size() != 0 ) {
-      LastUsedFile lastUsedFile = lastUsedFiles.get( lastUsedFiles.size() - 1 );
-      if ( !lastUsedFile.isSourceRepository() ) {
-        Spoon.getInstance().setLastFileOpened( lastUsedFile.getFilename() );
-      }
-    }
-
     /*
      *  The following lines are webSpoon additional functions
      */