diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 6460027e90..f1145fca95 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -285,6 +285,11 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
             failedLoad = true;
         }
 
+        // This fixes a focus issue after the progress reporter is done on GTK.  It shouldn't
+        // cause any issues on macOS and Windows.  If it does, it will have to be conditionally
+        // compiled.
+        Raise();
+
         if( failedLoad )
         {
             // Do not leave g_RootSheet == NULL because it is expected to be
diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp
index 71dbfea4fe..818037bef6 100644
--- a/pcbnew/files.cpp
+++ b/pcbnew/files.cpp
@@ -739,6 +739,11 @@ bool PCB_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
             return false;
         }
 
+        // This fixes a focus issue after the progress reporter is done on GTK.  It shouldn't
+        // cause any issues on macOS and Windows.  If it does, it will have to be conditionally
+        // compiled.
+        Raise();
+
         SetBoard( loadedBoard );
 
         if( GFootprintList.GetCount() == 0 )