diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 53253c1da..57b627c77 100755
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -241,7 +241,8 @@ def show_change(cur_artist, cur_album, match):
             if mediums and mediums > 1:
                 return u'{0}-{1}'.format(medium, medium_index)
             else:
-                return six.text_type(medium_index or index)
+                return six.text_type(medium_index if medium_index is not None
+                                     else index)
         else:
             return six.text_type(index)
 
diff --git a/docs/changelog.rst b/docs/changelog.rst
index e6ee7df3c..e394a4cd9 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -86,6 +86,9 @@ Fixes:
   returned by Spotify Albums API.
   Thanks to :user:`rhlahuja`.
   :bug:`3343`
+* Fixed a bug that caused the UI to display incorrect track numbers for tracks
+  with index 0 when the ``per_disc_numbering`` option was set.
+  :bug:`3346`
 
 For plugin developers: