diff --git a/comment.c b/comment.c
index 1a1b11e2b..e0b98fb97 100644
--- a/comment.c
+++ b/comment.c
@@ -209,7 +209,7 @@ static const char *interesting[] = {
 	"comment",
 	"bpm",
 	"arranger", "composer", "conductor", "lyricist", "performer",
-	"remixer", "label", "publisher", "work", "opus", "partnumber", "part",
+	"remixer", "label", "publisher", "work", "opus",
 	"subtitle", "media",
 	NULL
 };
@@ -221,7 +221,9 @@ static struct {
 	{ "album_artist", "albumartist" },
 	{ "album artist", "albumartist" },
 	{ "disc", "discnumber" },
-	{ "dicstotal", "totaldiscs" },
+	{ "part", "discnumber" },
+	{ "partnumber", "discnumber" },
+	{ "disctotal", "totaldiscs" },
 	{ "tempo", "bpm" },
 	{ "track", "tracknumber" },
 	{ "WM/Year", "date" },
diff --git a/ui_curses.c b/ui_curses.c
index 4dd2919c5..6788d3172 100644
--- a/ui_curses.c
+++ b/ui_curses.c
@@ -562,8 +562,8 @@ static void fill_track_fopts_track_info(struct track_info *info)
 	fopt_set_str(&track_fopts[TF_PUBLISHER], keyvals_get_val(info->comments, "publisher"));
 	fopt_set_str(&track_fopts[TF_WORK], keyvals_get_val(info->comments, "work"));
 	fopt_set_str(&track_fopts[TF_OPUS], keyvals_get_val(info->comments, "opus"));
-	fopt_set_str(&track_fopts[TF_PARTNUMBER], keyvals_get_val(info->comments, "partnumber"));
-	fopt_set_str(&track_fopts[TF_PART], keyvals_get_val(info->comments, "part"));
+	fopt_set_str(&track_fopts[TF_PARTNUMBER], keyvals_get_val(info->comments, "discnumber"));
+	fopt_set_str(&track_fopts[TF_PART], keyvals_get_val(info->comments, "discnumber"));
 	fopt_set_str(&track_fopts[TF_SUBTITLE], keyvals_get_val(info->comments, "subtitle"));
 	fopt_set_str(&track_fopts[TF_MEDIA], info->media);
 	fopt_set_int(&track_fopts[TF_VA], 0, !track_is_compilation(info->comments));