diff --git a/NEWS b/NEWS
index 361905d85..c1703cd70 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,8 @@
   more fairly by the autotagger. For example, if you're missing the
   acute accent on the "e" in "cafe", that change won't be penalized.
   This introduces a new dependency on the "unidecode" Python module.
+* When tagging a track with no title set, the track's filename is now
+  shown (instead of nothing at all).
 * The bitrate of lossless files is now calculated from their file size
   (rather than being fixed at 0 or reflecting the uncompressed audio
   bitrate).
diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 9c1a3838e..47f299f25 100755
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -118,6 +118,10 @@ def show_change(cur_artist, cur_album, items, info, dist, color=True):
             if cur_track != new_track:
                 cur_track = ui.colorize('red', cur_track)
                 new_track = ui.colorize('red', new_track)
+
+        # Show filename (non-colorized) when title is not set.
+        if not item.title.strip():
+            cur_title = os.path.basename(item.path)
         
         if cur_title != new_title and cur_track != new_track:
             print_(" * %s (%s) -> %s (%s)" % (