diff --git a/Source/hu_stuff.c b/Source/hu_stuff.c
index 2c0165c4..7b7a0444 100644
--- a/Source/hu_stuff.c
+++ b/Source/hu_stuff.c
@@ -757,14 +757,14 @@ void HU_Drawer(void)
       fixed_t x,y,z;   // killough 10/98:
       void AM_Coordinates(const mobj_t *, fixed_t *, fixed_t *, fixed_t *);
 
-      if (automapactive && !(hud_distributed && automapoverlay)) // [FG] moved here
+      if (automapactive && !(hud_displayed && automapoverlay)) // [FG] moved here
       {
       // map title
       HUlib_drawTextLine(&w_title, false);
       }
 
       // [FG] draw player coords widget
-      if ((automapactive && map_player_coords == 1) || map_player_coords == 2)
+      if (automapactive && !(hud_distributed && automapoverlay) && map_player_coords)
       {
       // killough 10/98: allow coordinates to display non-following pointer 
       AM_Coordinates(plr->mo, &x, &y, &z);
@@ -1450,7 +1450,7 @@ void HU_Ticker(void)
       char *s;
 
       // [crispy] move map title to the bottom
-      if (automapoverlay && screenblocks >= 11)
+      if (automapoverlay && screenblocks >= 11 && !hud_displayed)
         w_title.y = HU_TITLEY + ST_HEIGHT;
       else
         w_title.y = HU_TITLEY;