diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
index 01477243d..4e299a1b9 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/Main.java
@@ -375,6 +375,7 @@ public class Main {
         @Override
         protected Object doInBackground() throws Exception {
             boolean first = true;
+            SWF firstSWF = null;
             for (final SWFSourceInfo sourceInfo : sourceInfos) {
                 SWFList swfs = null;
                 try {
@@ -391,6 +392,9 @@ public class Main {
                 final SWFList swfs1 = swfs;
                 final boolean first1 = first;
                 first = false;
+                if(firstSWF == null){
+                    firstSWF = swfs1.get(0);
+                }
                 try {
                     Main.startWork(AppStrings.translate("work.creatingwindow") + "...");
                     View.execInEventDispatch(new Runnable() {
@@ -407,6 +411,7 @@ public class Main {
             }
 
             loadingDialog.setVisible(false);
+            final SWF fswf = firstSWF;
             View.execInEventDispatch(new Runnable() {
                 @Override
                 public void run() {
@@ -414,6 +419,9 @@ public class Main {
                         mainFrame.setVisible(true);
                     }
                     Main.stopWork();
+                    if (mainFrame != null && Configuration.gotoMainClassOnStartup.get()) {
+                        mainFrame.getPanel().gotoDocumentClass(fswf);
+                    }
                 }
             });
 
diff --git a/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java b/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
index c8739831f..169308095 100644
--- a/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
+++ b/trunk/src/com/jpexs/decompiler/flash/gui/MainPanel.java
@@ -720,9 +720,9 @@ public final class MainPanel extends JPanel implements ActionListener, TreeSelec
             showCard(CARDEMPTYPANEL);
             updateUi(swf);
 
-            if (first && Configuration.gotoMainClassOnStartup.get()) {
+            /*if (first && Configuration.gotoMainClassOnStartup.get()) {
                 gotoDocumentClass(swf);
-            }
+            }*/
             first = false;
         }
     }