diff --git a/gui/playlists/user.c b/gui/playlists/user.c
index 020d5fce..21e50bae 100644
--- a/gui/playlists/user.c
+++ b/gui/playlists/user.c
@@ -38,6 +38,21 @@ static bool __gui_pl_user_init_idle()
 	return true;
 }
 
+void __gui_pl_user_editing_started(GtkCellRenderer *renderer,
+				   GtkCellEditable *editable,
+				   gchar *path, gpointer data)
+{
+	struct playlist *playlist;
+	GtkTreeIter iter;
+
+	if (!gui_sidebar_iter_from_string(path, &iter))
+		return;
+
+	playlist = gui_sidebar_iter_playlist(&iter);
+	if (GTK_IS_ENTRY(editable))
+		gtk_entry_set_text(GTK_ENTRY(editable), playlist->pl_name);
+}
+
 void gui_pl_user_init()
 {
 	idle_schedule(IDLE_SYNC, __gui_pl_user_init_idle, NULL);
diff --git a/share/ocarina/ocarina.ui b/share/ocarina/ocarina.ui
index e5bbe251..c898be3d 100644
--- a/share/ocarina/ocarina.ui
+++ b/share/ocarina/ocarina.ui
@@ -791,7 +791,9 @@ audio-volume-medium</property>
                           <object class="GtkTreeViewColumn" id="treeviewcolumn3">
                             <property name="title" translatable="yes">column</property>
                             <child>
-                              <object class="GtkCellRendererText" id="cellrenderertext1"/>
+                              <object class="GtkCellRendererText" id="cellrenderertext1">
+                                <signal name="editing-started" handler="__gui_pl_user_editing_started" swapped="no"/>
+                              </object>
                               <attributes>
                                 <attribute name="editable">3</attribute>
                                 <attribute name="markup">1</attribute>