diff --git a/web/app/3d/main.js b/web/app/3d/main.js
index 59379008..41838950 100644
--- a/web/app/3d/main.js
+++ b/web/app/3d/main.js
@@ -53,7 +53,10 @@ TCAD.App = function() {
   }
 
   this.bus.subscribe("craft", function() {
-    app.viewer.selectionMgr.clear();
+    var historyEditMode = app.craft.historyPointer != app.craft.history.length;
+    if (!historyEditMode) {
+      app.viewer.selectionMgr.clear();
+    }
     app._refreshSketches();
   });
   window.addEventListener('storage', storage_handler, false);