diff --git a/src/playlist/playlist.cpp b/src/playlist/playlist.cpp
index ea07cca42..953a13de7 100644
--- a/src/playlist/playlist.cpp
+++ b/src/playlist/playlist.cpp
@@ -171,17 +171,6 @@ QVariant Playlist::headerData(int section, Qt::Orientation, int role) const {
 
 bool Playlist::column_is_editable(Playlist::Column column) {
   switch (column) {
-    case Column_Title:
-    case Column_Artist:
-    case Column_Album:
-    case Column_AlbumArtist:
-    case Column_Composer:
-    case Column_Performer:
-    case Column_Grouping:
-    case Column_Track:
-    case Column_Disc:
-    case Column_Year:
-    case Column_Genre:
     case Column_Score:
     case Column_Comment:
       return true;
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index b4edfb485..722fc7f0a 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -1393,7 +1393,7 @@ void MainWindow::PlaylistRightClick(const QPoint& global_pos, const QModelIndex&
 
     ui_->action_selection_set_value->setText(tr("Set %1 to \"%2\"...")
              .arg(column_name.toLower()).arg(column_value));
-    ui_->action_edit_value->setText(tr("Edit tag \"%1\"...").arg(column_name));
+    ui_->action_edit_value->setText(tr("Edit \"%1\"...").arg(column_name));
 
     // Is it a library item?
     PlaylistItemPtr item = app_->playlist_manager()->current()->item_at(source_index.row());