diff --git a/src/map.c b/src/map.c
index 1c25bd3..b98b5a7 100644
--- a/src/map.c
+++ b/src/map.c
@@ -59,6 +59,10 @@ void map_open(void) {
   /* Mark systems as needed. */
   mission_sysMark();
 
+  /* Attempt to select current map if none is selected. */
+  if(map_selected == -1)
+    map_selectCur();
+
   map_wid = window_create("Star Map", -1, -1, WINDOW_WIDTH, WINDOW_HEIGHT);
 
   window_addText(map_wid, -20, -20, 100, 20, 1, "txtSysname",
diff --git a/src/player.c b/src/player.c
index 718b686..71bb44d 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1341,6 +1341,7 @@ void player_targetHyperspace(void) {
   planet_target = -1; /* Remove planet target. */
   player_rmFlag(PLAYER_LANDACK); /* Get rid of landing permission. */
   hyperspace_target++;
+  map_clear(); /* Clear the current map path. */
 
   if(hyperspace_target >= cur_system->njumps)
     hyperspace_target = -1;