diff --git a/bluesky/stack/cmdparser.py b/bluesky/stack/cmdparser.py
index 4bc99dd472..1516e68367 100644
--- a/bluesky/stack/cmdparser.py
+++ b/bluesky/stack/cmdparser.py
@@ -1,5 +1,6 @@
 ''' Stack Command implementation. '''
 import inspect
+from typing import Dict
 
 from bluesky.core.funcobject import FuncObject
 from bluesky.network.sharedstate import publisher
@@ -9,7 +10,7 @@
 class Command:
     ''' Stack command object. '''
     # Dictionary with all command objects
-    cmddict: dict[str, 'Command'] = dict()
+    cmddict: Dict[str, 'Command'] = dict()
 
     @staticmethod
     @publisher(topic='STACKCMDS')
diff --git a/bluesky/ui/qtgl/glmap.py b/bluesky/ui/qtgl/glmap.py
index 4b97acc687..660dfa417e 100644
--- a/bluesky/ui/qtgl/glmap.py
+++ b/bluesky/ui/qtgl/glmap.py
@@ -67,6 +67,8 @@ def create(self):
                 break
 
     def draw(self, skipmap=False):
+        actdata = bs.net.get_nodedata()
+
         # Send the (possibly) updated global uniforms to the buffer
         self.shaderset.set_vertex_scale_type(self.shaderset.VERTEX_IS_LATLON)
 
@@ -75,7 +77,13 @@ def draw(self, skipmap=False):
         self.shaderset.enable_wrap(False)
 
         if self.show_map and not skipmap:
+
             self.map.draw()
+        
+        # Skip coastlines if set to disabled
+        if not actdata.show_coast:
+            return
+
         shaderset = glh.ShaderSet.selected
         if not self.show_coast:
             return