diff --git a/client/src/components/annotator/Category.vue b/client/src/components/annotator/Category.vue
index e694b57a..cf39da10 100755
--- a/client/src/components/annotator/Category.vue
+++ b/client/src/components/annotator/Category.vue
@@ -200,6 +200,7 @@ export default {
 
           this.selectedAnnotation = annotationId;
           this.$nextTick(() => {
+            this.$parent.selectLastEditorTool();
             this.$emit("click", {
               annotation: annotationId,
               category: this.index
diff --git a/client/src/components/annotator/tools/BrushTool.vue b/client/src/components/annotator/tools/BrushTool.vue
index 01daf9aa..0a53d320 100755
--- a/client/src/components/annotator/tools/BrushTool.vue
+++ b/client/src/components/annotator/tools/BrushTool.vue
@@ -118,6 +118,7 @@ export default {
 
       if (active) {
         this.tool.activate();
+        localStorage.setItem("editorTool", this.name)
       }
     },
     /**
diff --git a/client/src/components/annotator/tools/EraserTool.vue b/client/src/components/annotator/tools/EraserTool.vue
index 8b508b33..c4d1168a 100755
--- a/client/src/components/annotator/tools/EraserTool.vue
+++ b/client/src/components/annotator/tools/EraserTool.vue
@@ -116,6 +116,7 @@ export default {
 
       if (active) {
         this.tool.activate();
+        localStorage.setItem("editorTool", this.name)
       }
     },
     /**
diff --git a/client/src/components/annotator/tools/MagicWandTool.vue b/client/src/components/annotator/tools/MagicWandTool.vue
index 74745528..94ab31e4 100755
--- a/client/src/components/annotator/tools/MagicWandTool.vue
+++ b/client/src/components/annotator/tools/MagicWandTool.vue
@@ -32,6 +32,14 @@ export default {
       }
     };
   },
+  watch: {
+    isActive(active) {
+      if (active) {
+        this.tool.activate();
+        localStorage.setItem("editorTool", this.name)
+      }
+    }
+  },
   methods: {
     /**
      * Exports settings
diff --git a/client/src/components/annotator/tools/PolygonTool.vue b/client/src/components/annotator/tools/PolygonTool.vue
index ae4cd20b..5f7f701e 100755
--- a/client/src/components/annotator/tools/PolygonTool.vue
+++ b/client/src/components/annotator/tools/PolygonTool.vue
@@ -221,6 +221,12 @@ export default {
     }
   },
   watch: {
+    isActive(active) {
+      if (active) {
+        this.tool.activate();
+        localStorage.setItem("editorTool", this.name)
+      }
+    },
     /**
      * Change width of stroke based on zoom of image
      */
diff --git a/client/src/components/cards/ImageCard.vue b/client/src/components/cards/ImageCard.vue
index c3ec2b13..3777b504 100755
--- a/client/src/components/cards/ImageCard.vue
+++ b/client/src/components/cards/ImageCard.vue
@@ -6,14 +6,15 @@
       @mouseover="hover = true"
       @mouseleave="hover = false"
     >
-      <v-lazy-image
-        :src="imageUrl"
-        :src-placeholder="loaderUrl"
-        @click="openAnnotator"
-        class="card-img-top"
-        style="width: 100%; display: block"
-        :style="{'opacity': annotated ? 0.3 : 1}"
-      />
+      <div @click="openAnnotator">
+        <v-lazy-image
+          :src="imageUrl"
+          :src-placeholder="loaderUrl"
+          class="card-img-top"
+          style="width: 100%; display: block"
+          :style="{'opacity': annotated ? 0.3 : 1}"
+        />
+      </div>
 
       <b v-if="annotated" class="overlay-text text-center">
         Being annotated by {{image.annotating.join(', ')}}
diff --git a/client/src/views/Annotator.vue b/client/src/views/Annotator.vue
index 4a4e0351..3b2c892a 100755
--- a/client/src/views/Annotator.vue
+++ b/client/src/views/Annotator.vue
@@ -537,6 +537,10 @@ export default {
       this.currentAnnotation.subtract(compound, simplify, undoable);
     },
 
+    selectLastEditorTool() {
+      this.activeTool = localStorage.getItem("editorTool") || "Select"
+    },
+
     setCursor(newCursor) {
       this.cursor = newCursor;
     },