diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp
index f040f7155..25e19af0e 100644
--- a/src/playlist/playlistview.cpp
+++ b/src/playlist/playlistview.cpp
@@ -1109,6 +1109,11 @@ void PlaylistView::ReloadSettings() {
     emit BackgroundPropertyChanged();
     force_background_redraw_ = true;
   }
+
+  if(!s.value("click_edit_inline", true).toBool())
+      setEditTriggers(editTriggers() & ~QAbstractItemView::SelectedClicked);
+  else
+      setEditTriggers(editTriggers() | QAbstractItemView::SelectedClicked);
 }
 
 void PlaylistView::SaveSettings() {
diff --git a/src/ui/behavioursettingspage.cpp b/src/ui/behavioursettingspage.cpp
index cdcadb2ac..0e9ff9104 100644
--- a/src/ui/behavioursettingspage.cpp
+++ b/src/ui/behavioursettingspage.cpp
@@ -131,6 +131,8 @@ void BehaviourSettingsPage::Load() {
   s.beginGroup(Playlist::kSettingsGroup);
   ui_->b_grey_out_deleted_->setChecked(
       s.value("greyoutdeleted", false).toBool());
+  ui_->b_click_edit_inline_->setChecked(
+      s.value("click_edit_inline", true).toBool());
   s.endGroup();
 
   s.beginGroup(PlaylistTabBar::kSettingsGroup);
@@ -179,6 +181,7 @@ void BehaviourSettingsPage::Save() {
 
   s.beginGroup(Playlist::kSettingsGroup);
   s.setValue("greyoutdeleted", ui_->b_grey_out_deleted_->isChecked());
+  s.setValue("click_edit_inline", ui_->b_click_edit_inline_->isChecked());
   s.endGroup();
 
   s.beginGroup(PlaylistTabBar::kSettingsGroup);
diff --git a/src/ui/behavioursettingspage.ui b/src/ui/behavioursettingspage.ui
index 14a9804ee..d244e473c 100644
--- a/src/ui/behavioursettingspage.ui
+++ b/src/ui/behavioursettingspage.ui
@@ -133,6 +133,13 @@
         </property>
        </widget>
       </item>
+      <item>
+       <widget class="QCheckBox" name="b_click_edit_inline_">
+        <property name="text">
+         <string>Enable song metadata inline edition with click</string>
+        </property>
+       </widget>
+      </item>
      </layout>
     </widget>
    </item>