diff --git a/gerbview/files.cpp b/gerbview/files.cpp
index 4c53f75aa9..22e5eb96f9 100644
--- a/gerbview/files.cpp
+++ b/gerbview/files.cpp
@@ -193,7 +193,10 @@ bool GERBVIEW_FRAME::LoadGerberFiles( const wxString& aFullFileName )
     // Set the busy cursor
     wxBusyCursor wait;
 
-    return LoadListOfGerberAndDrillFiles( currentPath, filenamesList );
+    bool success = LoadListOfGerberAndDrillFiles( currentPath, filenamesList );
+    Zoom_Automatique( false );
+
+    return success;
 }
 
 
@@ -329,8 +332,6 @@ bool GERBVIEW_FRAME::LoadListOfGerberAndDrillFiles( const wxString& aPath,
 
     SetVisibleLayers( visibility );
 
-    Zoom_Automatique( false );
-
     // Synchronize layers tools with actual active layer:
     ReFillLayerWidget();
 
diff --git a/gerbview/job_file_reader.cpp b/gerbview/job_file_reader.cpp
index 631e7cf9f8..9a624ff883 100644
--- a/gerbview/job_file_reader.cpp
+++ b/gerbview/job_file_reader.cpp
@@ -227,6 +227,8 @@ bool GERBVIEW_FRAME::LoadGerberJobFile( const wxString& aFullFileName )
             wxArrayString& gbrfiles = gbjReader.GetGerberFiles();
 
             success = LoadListOfGerberAndDrillFiles( currentPath, gbrfiles );
+
+            Zoom_Automatique( false );
         }
     }