diff --git a/js/controller/PiskelController.js b/js/controller/PiskelController.js
index 25028ce7..ab44d197 100644
--- a/js/controller/PiskelController.js
+++ b/js/controller/PiskelController.js
@@ -98,7 +98,7 @@
       l.removeFrameAt(index);
     });
     // Current frame index is impacted if the removed frame was before the current frame
-    if (this.currentFrameIndex >= index) {
+    if (this.currentFrameIndex >= index && this.currentFrameIndex > 0) {
       this.setCurrentFrameIndex(this.currentFrameIndex - 1);
     }
 
diff --git a/js/drawingtools/selectiontools/BaseSelect.js b/js/drawingtools/selectiontools/BaseSelect.js
index f6475699..b5ca0da1 100644
--- a/js/drawingtools/selectiontools/BaseSelect.js
+++ b/js/drawingtools/selectiontools/BaseSelect.js
@@ -92,6 +92,10 @@
     }
   };
 
+  ns.BaseSelect.prototype.hideHighlightedPixel = function() {
+    // there is no highlighted pixel for selection tools, do nothing
+  };
+
   /**
    * For each pixel in the selection draw it in white transparent on the tool overlay
    * @protected