diff --git a/src/App.css b/src/App.css
index d1e5cf909a174524e207d640e3f5673c235b2d82..6bfc984c2940566cfc1c2197cf0f9b4c129da376 100644
--- a/src/App.css
+++ b/src/App.css
@@ -148,13 +148,6 @@ div.login button:hover {
 /* Editing tooltips */
 .leaflet-tooltip {
   font-size: 18px;
-  /* by default leaflet doesn't allow selecting content in tooltips; overriding */
-  -webkit-user-select: text;
-  -moz-user-select: text;
-  -ms-user-select: text;
-  user-select: text;
-  pointer-events: all;
-  cursor: auto;
   /* Overriding tooltip layout by making it invisible */
   background-color: transparent;
   box-shadow: none;
@@ -162,10 +155,7 @@ div.login button:hover {
   padding: 0;
 }
 
-.leaflet-clickable {
-  pointer-events: all;
-}
-
+/* remove the small triangle on tooltip */
 .leaflet-tooltip-bottom:before {
   border: 0;
 }
diff --git a/src/components/DrawTools.js b/src/components/DrawTools.js
index 752e7c2c581862dec584237ece8a8217b0eb6c8a..00ee52aa71938a5e4159edaaf65464381c1b525b 100644
--- a/src/components/DrawTools.js
+++ b/src/components/DrawTools.js
@@ -8,7 +8,7 @@ import { FeatureGroup } from "react-leaflet";
 L.Draw.MarkerTextBox = L.Draw.Marker.extend({
   options: {
     icon: L.divIcon({
-      className: "dummy",
+      className: "", // empty class to override default styling
       iconSize: [20, 20],
       iconAnchor: [10, 20]
     }),
@@ -23,7 +23,7 @@ L.Draw.MarkerTextBox = L.Draw.Marker.extend({
 });
 
 // Overriding default toolbar
-// Just adding one new button, though, lol
+// Just adding one new button though lol
 L.DrawToolbar.include({
   getModeHandlers: function(map) {
     return [
@@ -88,10 +88,15 @@ class DrawTools extends Component {
         interactive: true
       });
 
-      // disable dragging when mousedown is active on top of marker (tooltip)
+      // disable dragging when cursor is over marker (tooltip)
       // clicking on tooltip fires the marker's click handler, hence e.layer.on
-      e.layer.on("mousedown", function() {
-        L.DomEvent.disableClickPropagation(tooltip);
+      e.layer.on("mouseover", function() {
+        e.layer._map.dragging.disable();
+      });
+
+      // enable dragging again when cursor is out of marker (tooltip)
+      e.layer.on("mouseout", function() {
+        e.layer._map.dragging.enable();
       });
 
       // show placeholder text again upon emptying textbox
@@ -107,33 +112,12 @@ class DrawTools extends Component {
           tooltip.innerHTML =
             '<div placeholder="Click here and type" contenteditable="true"></div>';
         }
-
-        console.log(tooltip.firstChild.childNodes.length);
-        let margintop = tooltip.firstChild.childNodes.length * 40;
-        console.log(e.layer);
-        //tooltip.style.marginTop = margintop.toString() + "px";
-
-        /*
-        let editable = document.querySelector(".editable");
-        let editableStyle = getComputedStyle(editable);
-        let horizontalLoc = parseInt(editableStyle.height.replace("px", ""));
-        let verticalLoc = parseInt(editableStyle.width.replace("px", ""));
-        let trueHorizontalLoc = horizontalLoc + 40;
-        let trueVerticalLoc = verticalLoc + 10;
-        tooltip.style.marginTop = horizontalLoc.toString() + "px";
-        */
-        /*
-        editable.firstChild.style.marginTop = toString(
-          trueHorizontalLoc + "px"
-        );
-        console.log("editable.firstChild.style: ");
-        console.log(editable.firstChild.style);
-        */
       });
-    }
+    } // end if (e.layerType === "textbox")
+
     // turning layer data to GeoJSON
     this.makeGeoJSON(e.layer);
-  };
+  }; // end _onCreated
 
   makeGeoJSON = e => {
     let geoJSON = e.toGeoJSON();