diff --git a/labelImg.py b/labelImg.py
index b11f9c15..8e6348b8 100755
--- a/labelImg.py
+++ b/labelImg.py
@@ -1096,10 +1096,6 @@ class MainWindow(QMainWindow, WindowMixin):
         self.canvas.setEnabled(False)
         if file_path is None:
             file_path = self.settings.get(SETTING_FILENAME)
-        #Deselect shape when loading new file
-        if self.canvas.selected_shape:
-            self.canvas.selected_shape.selected = False
-            self.canvas.selected_shape = None
         # Make sure that filePath is a regular python string, rather than QString
         file_path = ustr(file_path)
 
diff --git a/libs/canvas.py b/libs/canvas.py
index 8b7dc479..ccbcabde 100644
--- a/libs/canvas.py
+++ b/libs/canvas.py
@@ -737,6 +737,10 @@ class Canvas(QWidget):
         QApplication.restoreOverrideCursor()
 
     def reset_state(self):
+        self.de_select_shape()
+        self.un_highlight()
+        self.selected_shape_copy = None
+
         self.restore_cursor()
         self.pixmap = None
         self.update()