5 files changed, 9 insertions, 7 deletions
diff --git a/crawl-ref/source/files.cc b/crawl-ref/source/files.cc
index 932c0a6a2c..f21f792461 100644
--- a/crawl-ref/source/files.cc
+++ b/crawl-ref/source/files.cc
@@ -1386,10 +1386,6 @@ void load_ghost(void)
 
         menv[imn].set_ghost(ghosts[0]);
         menv[imn].ghost_init();
-        
-#ifdef USE_TILE
-        TileGhostInit(ghosts[0]);
-#endif
 
         ghosts.erase(ghosts.begin());        
     }
diff --git a/crawl-ref/source/libgui.cc b/crawl-ref/source/libgui.cc
index 80a92dfd74..b8c5ab4881 100644
--- a/crawl-ref/source/libgui.cc
+++ b/crawl-ref/source/libgui.cc
@@ -452,6 +452,9 @@ void GmapDisplay(int linex, int liney)
 /* initialize routines */
 static void do_layout()
 {
+    // buffer between map region and stat region
+    const int map_stat_buffer = 5;
+
 #define LAYER_NML 0
 #define LAYER_CRT 1
 #define LAYER_XMAP 2
@@ -469,7 +472,8 @@ static void do_layout()
     win_main->placeRegion(region_msg, LAYER_NML, region_tile, PLACE_BOTTOM,
         tm, tm, tm, tm);
 
-    int sx = std::max(region_msg->ex + region_msg->dx, region_tile->ex);
+    int sx = std::max(region_msg->ex + region_msg->dx, region_tile->ex) +
+        map_stat_buffer;
     int sy = 0;
     win_main->placeRegion(region_stat, LAYER_NML, sx, sy);
 
diff --git a/crawl-ref/source/mon-util.cc b/crawl-ref/source/mon-util.cc
index dff1759555..08b8c9ce01 100644
--- a/crawl-ref/source/mon-util.cc
+++ b/crawl-ref/source/mon-util.cc
@@ -51,6 +51,7 @@
 #include "spl-util.h"
 #include "stuff.h"
 #include "terrain.h"
+#include "tiles.h"
 #include "traps.h"
 #include "view.h"
 
@@ -3743,6 +3744,7 @@ void monsters::slow_down(int strength)
 
 void monsters::set_ghost(const ghost_demon &g)
 {
+    TileGhostInit(g);
     ghost.reset( new ghost_demon(g) );
 }
 
diff --git a/crawl-ref/source/tile2.cc b/crawl-ref/source/tile2.cc
index 353189e11b..ac2f808421 100644
--- a/crawl-ref/source/tile2.cc
+++ b/crawl-ref/source/tile2.cc
@@ -2107,7 +2107,7 @@ void TilePlayerInit()
 
 }
 
-void TileGhostInit(struct ghost_demon &ghost)
+void TileGhostInit(const struct ghost_demon &ghost)
 {
     dolls_data doll;
     int x, y;
diff --git a/crawl-ref/source/tiles.h b/crawl-ref/source/tiles.h
index 96e68351d3..0a6ffdc7ea 100644
--- a/crawl-ref/source/tiles.h
+++ b/crawl-ref/source/tiles.h
@@ -109,7 +109,7 @@ void TilePlayerEdit();
 // init player tile
 void TilePlayerInit();
 // init ghost tile
-void TileGhostInit(struct ghost_demon &gs);
+void TileGhostInit(const struct ghost_demon &gs);
 // init pandem demon tile (only in iso mode)
 void TilePandemInit(struct ghost_demon &gs);
 // edit pandem tile (debug)