diff --git a/src/plugins/help/remotehelpfilter.cpp b/src/plugins/help/remotehelpfilter.cpp
index a66c5095fad..f11767a2105 100644
--- a/src/plugins/help/remotehelpfilter.cpp
+++ b/src/plugins/help/remotehelpfilter.cpp
@@ -50,6 +50,8 @@ RemoteFilterOptions::RemoteFilterOptions(RemoteHelpFilter *filter, QWidget *pare
 
     connect(m_ui.add, SIGNAL(clicked()), this, SLOT(addNewItem()));
     connect(m_ui.remove, SIGNAL(clicked()), this, SLOT(removeItem()));
+    connect(m_ui.listWidget, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)), SLOT(updateRemoveButton()));
+    updateRemoveButton();
 }
 
 void RemoteFilterOptions::addNewItem()
@@ -58,6 +60,7 @@ void RemoteFilterOptions::addNewItem()
     m_ui.listWidget->addItem(item);
     item->setSelected(true);
     item->setFlags(item->flags() | Qt::ItemIsEditable);
+    m_ui.listWidget->setCurrentItem(item);
     m_ui.listWidget->editItem(item);
 }
 
@@ -69,6 +72,11 @@ void RemoteFilterOptions::removeItem()
     }
 }
 
+void RemoteFilterOptions::updateRemoveButton()
+{
+    m_ui.remove->setEnabled(m_ui.listWidget->currentItem());
+}
+
 // -- RemoteHelpFilter
 
 RemoteHelpFilter::RemoteHelpFilter()
diff --git a/src/plugins/help/remotehelpfilter.h b/src/plugins/help/remotehelpfilter.h
index cd5fae181e6..ba43867af8b 100644
--- a/src/plugins/help/remotehelpfilter.h
+++ b/src/plugins/help/remotehelpfilter.h
@@ -79,6 +79,7 @@ public:
 private slots:
     void addNewItem();
     void removeItem();
+    void updateRemoveButton();
 
 private:
     RemoteHelpFilter *m_filter;