diff --git a/src/plugins/todo/optionsdialog.cpp b/src/plugins/todo/optionsdialog.cpp
index ba56162ba366715161aa35d58f3a45ae4bdafd20..9c98b4a876d60b29dacc6c2c4f6e533ef9503a3e 100644
--- a/src/plugins/todo/optionsdialog.cpp
+++ b/src/plugins/todo/optionsdialog.cpp
@@ -49,6 +49,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) :
     connect(ui->removeButton, SIGNAL(clicked()), SLOT(removeButtonClicked()));
     connect(ui->editButton, SIGNAL(clicked()), SLOT(editButtonClicked()));
     connect(ui->resetButton, SIGNAL(clicked()), SLOT(resetButtonClicked()));
+    connect(ui->keywordsList, SIGNAL(itemDoubleClicked(QListWidgetItem*)), SLOT(itemDoubleClicked(QListWidgetItem*)));
 }
 
 OptionsDialog::~OptionsDialog()
@@ -56,6 +57,11 @@ OptionsDialog::~OptionsDialog()
     delete ui;
 }
 
+void OptionsDialog::itemDoubleClicked(QListWidgetItem *item)
+{
+    editItem(item);
+}
+
 void OptionsDialog::setSettings(const Settings &settings)
 {
     uiFromSettings(settings);
@@ -98,7 +104,11 @@ void OptionsDialog::addButtonClicked()
 void OptionsDialog::editButtonClicked()
 {
     QListWidgetItem *item = ui->keywordsList->currentItem();
+    editItem(item);
+}
 
+void OptionsDialog::editItem(QListWidgetItem *item)
+{
     Keyword keyword;
     keyword.name = item->text();
     keyword.iconResource = item->data(Qt::UserRole).toString();
diff --git a/src/plugins/todo/optionsdialog.h b/src/plugins/todo/optionsdialog.h
index adeb44a0688b9bfb9d30356d8fbe0109c2f3eae5..431d7711652a4b87434a6950381a97020ca12043 100644
--- a/src/plugins/todo/optionsdialog.h
+++ b/src/plugins/todo/optionsdialog.h
@@ -34,6 +34,8 @@
 
 #include <QWidget>
 
+class QListWidgetItem;
+
 namespace Todo {
 namespace Internal {
 
@@ -60,11 +62,13 @@ private slots:
     void removeButtonClicked();
     void resetButtonClicked();
     void setButtonsEnabled();
+    void itemDoubleClicked(QListWidgetItem *item);
 
 private:
     void uiFromSettings(const Settings &settings);
     Settings settingsFromUi();
     void addToKeywordsList(const Keyword &keyword);
+    void editItem(QListWidgetItem *item);
     QSet<QString> keywordNames();
 
     Ui::OptionsDialog *ui;