diff --git a/Canvas.js b/Canvas.js
index fb901f6ab..4bc5bb3dc 100644
--- a/Canvas.js
+++ b/Canvas.js
@@ -256,6 +256,10 @@ function newCanvas () {
       canvas.floatingSpace.exitMapMode()
     }
 
+    if (event.key === 'M' || event.key === 'm') {
+      canvas.floatingSpace.toggleMapMode()
+    }
+
     let nodeOnFocus = canvas.designSpace.workspace.getNodeThatIsOnFocus()
     if (nodeOnFocus !== undefined) {
       if (nodeOnFocus.payload.uiObject.codeEditor !== undefined) {
diff --git a/Spaces/FloatingSpace.js b/Spaces/FloatingSpace.js
index 24237e442..68c801a98 100644
--- a/Spaces/FloatingSpace.js
+++ b/Spaces/FloatingSpace.js
@@ -12,6 +12,7 @@ function newFloatingSpace () {
     uiObjectConstructor: undefined,
     container: undefined,
     inMapMode: false,
+    toggleMapMode: toggleMapMode,
     exitMapMode: exitMapMode,
     transformPointToMap: transformPointToMap,
     transformRadiusToMap: transformRadiusToMap,
@@ -114,13 +115,21 @@ function newFloatingSpace () {
     doubleClickCounter = 0
   }
 
+  function toggleMapMode () {
+    if (thisObject.inMapMode === false) {
+      thisObject.inMapMode = true
+    } else {
+      exitMapMode()
+    }
+  }
+
   function onDragStarted (event) {
     if (thisObject.inMapMode === false) {
       if (doubleClickCounter > 0) {
         onDoubleClick()
         return
       } else {
-        doubleClickCounter = 10
+        doubleClickCounter = 8
       }
     } else {
       thisObject.container.frame.position.x = -event.x / browserCanvas.width * SPACE_SIZE + browserCanvas.width / 2