diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index bc9397eb1..7e02f26b1 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -60,10 +60,11 @@ http://www.tuxpaint.org/
   * Other Improvements:
     -------------------
     * A keyboard shortcut is now available for quickly accessing
-      a small eraser.  Hold the [Del] key while clicking, and drag
+      a small eraser.  Hold the [X] key while clicking, and drag
       around the picture to erase.  (Not available if in the process
-      of rotating a stamp or shape.)  Release the mouse to return to
-      normal operation.
+      of rotating a stamp or shape, or when Text or Label tool are
+      active.)  Release the mouse to return to normal operation.
+
       (Eventually, this could be utilized when we can support
       the recognition of a drawing tablet stylus' "eraser" tip;
       see https://sourceforge.net/p/tuxpaint/feature-requests/8/)
diff --git a/src/tuxpaint.c b/src/tuxpaint.c
index 84ef7bf0f..53c418224 100644
--- a/src/tuxpaint.c
+++ b/src/tuxpaint.c
@@ -5363,14 +5363,16 @@ static void mainloop(void)
 
             SDL_Flip(screen);
           }
-          else if (kbd_state[SDL_SCANCODE_DELETE] /* FIXME */)
+          else if (kbd_state[SDL_SCANCODE_X])
           {
-            /* Holding [Del] while clicking; switch to temp-mode eraser!
+            /* Holding [X] while clicking; switch to temp-mode eraser!
                (as long as we're not involved in anything else within
                this main loop!) */
 
             if ((cur_tool != TOOL_SHAPES || shape_mode == SHAPE_TOOL_MODE_DONE) &&
-                (cur_tool != TOOL_STAMP || stamp_tool_mode == STAMP_TOOL_MODE_PLACE))
+                (cur_tool != TOOL_STAMP || stamp_tool_mode == STAMP_TOOL_MODE_PLACE) &&
+                cur_tool != TOOL_TEXT &&
+                cur_tool != TOOL_LABEL)
             {
               do_quick_eraser();
             }