diff --git a/src/helpfile.h b/src/helpfile.h
index 53ae5433..7cd9c88a 100644
--- a/src/helpfile.h
+++ b/src/helpfile.h
@@ -198,6 +198,8 @@ static const T_Help_table helptable_help[] =
   HELP_LINK ("Smear mode:          %s",   SPECIAL_SMEAR_MODE)
   HELP_LINK ("Tiling mode:         %s",   SPECIAL_TILING_MODE)
   HELP_LINK ("Tiling menu:         %s",   SPECIAL_TILING_MENU)
+  HELP_LINK ("Tilemap mode:        %s",   SPECIAL_TILEMAP_MODE)
+  HELP_LINK ("Tilemap menu:        %s",   SPECIAL_TILEMAP_MENU)
   HELP_LINK ("Pick brush:          %s",   0x100+BUTTON_BRUSH)
   HELP_LINK ("Pick polyform brush: %s",   0x100+BUTTON_POLYBRUSH)
   HELP_LINK ("Restore brush:       %s",   0x200+BUTTON_BRUSH)
@@ -1875,6 +1877,37 @@ static const T_Help_table helptable_effects[] =
   HELP_TEXT ("Opens a menu where you can define the Tiling")
   HELP_TEXT ("parameters. These parameters are the offsets")
   HELP_TEXT ("of the tiling.")
+  HELP_TEXT ("")
+  HELP_TEXT ("")
+  HELP_TITLE("TILEMAP")
+  HELP_TEXT (" This mode analyses the current image to")
+  HELP_TEXT ("define identical rectangular tiles. After")
+  HELP_TEXT ("that, anything you draw is repeated on all")
+  HELP_TEXT ("other occurrences of the same tile. The tile")
+  HELP_TEXT ("dimensions are defined by the Grid settings")
+  HELP_TEXT ("(but the grid mode doesn't have to be")
+  HELP_TEXT ("active). ")
+  HELP_BOLD ("LEFT CLICK")
+  HELP_LINK ("(Key: %s)",   SPECIAL_TILEMAP_MODE)
+  HELP_TEXT ("")
+  HELP_TEXT ("Switches the Tilemap mode. Note that it is")
+  HELP_TEXT ("set separately for the main and spare page.")
+  HELP_TEXT ("")
+  HELP_TEXT ("")
+  HELP_BOLD ("RIGHT CLICK")
+  HELP_LINK ("(Key: %s)",   SPECIAL_TILEMAP_MENU)
+  HELP_TEXT ("")
+  HELP_TEXT ("Opens a menu where you can define the")
+  HELP_TEXT ("following options for the tilemap mode:")
+  HELP_TEXT ("")
+  HELP_TEXT ("* Detect mirrored : When this is active,")
+  HELP_TEXT ("Grafx2 detects tiles that are exact mirrored")
+  HELP_TEXT ("versions of another. It can be set")
+  HELP_TEXT ("separately for X and Y.")
+  HELP_TEXT ("")
+  HELP_TEXT ("* Show count : Briefly displays the number")
+  HELP_TEXT ("of unique tiles after each analysis.")
+  HELP_TEXT ("")
 };
 static const T_Help_table helptable_text[] =
 {
diff --git a/src/tiles.c b/src/tiles.c
index 32a0c46c..3f3b4c82 100644
--- a/src/tiles.c
+++ b/src/tiles.c
@@ -314,9 +314,9 @@ void Tilemap_update(void)
   if (width*height > 1000 || Config.Tilemap_show_count)
   {
     wait_window=1;
+    old_cursor=Cursor_shape;
     Open_window(180,36,"Creating tileset");
     Print_in_window(26, 20, "Please wait...",MC_Black,MC_Light);
-    old_cursor=Cursor_shape;
     Cursor_shape=CURSOR_SHAPE_HOURGLASS;
     Update_window_area(0,0,Window_width, Window_height);
     Display_cursor();