diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp
index 6d571bbcb8..9d1004bf1e 100644
--- a/eeschema/sheet.cpp
+++ b/eeschema/sheet.cpp
@@ -723,7 +723,8 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, SCH_SHEET_PATH* aHierarchy,
             aHierarchy->LastScreen()->Remove( aSheet );
         }
 
-        if( !LoadSheetFromFile( aSheet, aHierarchy, newFilename ) )
+        if( !LoadSheetFromFile( aSheet, aHierarchy, newFilename )
+                || checkSheetForRecursion( aSheet, aHierarchy ) )
         {
             if( restoreSheet )
                 aHierarchy->LastScreen()->Append( aSheet );