diff --git a/common/gestfich.cpp b/common/gestfich.cpp
index c8467ad5f1..7b8ab266c6 100644
--- a/common/gestfich.cpp
+++ b/common/gestfich.cpp
@@ -140,14 +140,7 @@ int ExecuteFile( const wxString& aEditorName, const wxString& aFileName, wxProce
             args[i++] = param.wc_str();
 
         if( !aFileName.IsEmpty() )
-        {
-            wxString name = aFileName;
-
-            // A quoted filename is incorrectly handled here, perhaps because wxExecute
-            // add quotes. So remove quotes if any (they also are illegal in filenames).
-            name.Replace( "\"", "" );
-            args[i++] = name.wc_str();
-        }
+            args[i++] = aFileName.wc_str();
 
         args[i] = nullptr;
 
diff --git a/eeschema/sch_edit_frame.cpp b/eeschema/sch_edit_frame.cpp
index 32767a0acf..96edd2c78b 100644
--- a/eeschema/sch_edit_frame.cpp
+++ b/eeschema/sch_edit_frame.cpp
@@ -984,8 +984,7 @@ void SCH_EDIT_FRAME::OnOpenPcbnew( wxCommandEvent& event )
 
         if( Kiface().IsSingle() )
         {
-            wxString filename = QuoteFullPath( boardfn );
-            ExecuteFile( PCBNEW_EXE, filename );
+            ExecuteFile( PCBNEW_EXE, boardfn.GetFullPath() );
         }
         else
         {
diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp
index 3097cc4b14..b36ce218ae 100644
--- a/pcbnew/pcb_edit_frame.cpp
+++ b/pcbnew/pcb_edit_frame.cpp
@@ -1505,8 +1505,7 @@ void PCB_EDIT_FRAME::RunEeschema()
 
     if( Kiface().IsSingle() )
     {
-        wxString filename = wxT( "\"" ) + schematic.GetFullPath( wxPATH_NATIVE ) + wxT( "\"" );
-        ExecuteFile( EESCHEMA_EXE, filename );
+        ExecuteFile( EESCHEMA_EXE, schematic.GetFullPath() );
     }
     else
     {