diff --git a/src/smartplaylists/smartplaylistsearchtermwidget.cpp b/src/smartplaylists/smartplaylistsearchtermwidget.cpp
index f622af2f8..36032712c 100644
--- a/src/smartplaylists/smartplaylistsearchtermwidget.cpp
+++ b/src/smartplaylists/smartplaylistsearchtermwidget.cpp
@@ -68,6 +68,7 @@ SmartPlaylistSearchTermWidget::SmartPlaylistSearchTermWidget(LibraryBackend* lib
 {
   ui_->setupUi(this);
   connect(ui_->field, SIGNAL(currentIndexChanged(int)), SLOT(FieldChanged(int)));
+  connect(ui_->remove, SIGNAL(clicked()), SIGNAL(RemoveClicked()));
 
   // Populate the combo boxes
   for (int i=0 ; i<SmartPlaylistSearchTerm::FieldCount ; ++i) {
diff --git a/src/smartplaylists/smartplaylistsearchtermwidget.h b/src/smartplaylists/smartplaylistsearchtermwidget.h
index 1b7a5024b..4a6528ad3 100644
--- a/src/smartplaylists/smartplaylistsearchtermwidget.h
+++ b/src/smartplaylists/smartplaylistsearchtermwidget.h
@@ -42,6 +42,7 @@ public:
 
 signals:
   void Clicked();
+  void RemoveClicked();
 
 protected:
   void showEvent(QShowEvent*);
diff --git a/src/smartplaylists/smartplaylistwizard.cpp b/src/smartplaylists/smartplaylistwizard.cpp
index 8b61a9946..c8bc75891 100644
--- a/src/smartplaylists/smartplaylistwizard.cpp
+++ b/src/smartplaylists/smartplaylistwizard.cpp
@@ -35,13 +35,29 @@ SmartPlaylistWizard::SmartPlaylistWizard(LibraryBackend* library, QWidget* paren
   AddSearchTerm();
 }
 
+SmartPlaylistWizard::~SmartPlaylistWizard() {
+  delete ui_;
+}
+
 void SmartPlaylistWizard::AddSearchTerm() {
   SmartPlaylistSearchTermWidget* widget =
       new SmartPlaylistSearchTermWidget(library_, this);
+  connect(widget, SIGNAL(RemoveClicked()), SLOT(RemoveSearchTerm()));
+
   search_term_layout_->insertWidget(search_terms_.count(), widget);
   search_terms_ << widget;
 }
 
-SmartPlaylistWizard::~SmartPlaylistWizard() {
-  delete ui_;
+void SmartPlaylistWizard::RemoveSearchTerm() {
+  SmartPlaylistSearchTermWidget* widget =
+      qobject_cast<SmartPlaylistSearchTermWidget*>(sender());
+  if (!widget)
+    return;
+
+  const int index = search_terms_.indexOf(widget);
+  if (index == -1)
+    return;
+
+  delete search_terms_.takeAt(index);
 }
+
diff --git a/src/smartplaylists/smartplaylistwizard.h b/src/smartplaylists/smartplaylistwizard.h
index de4a306c5..51f016f6f 100644
--- a/src/smartplaylists/smartplaylistwizard.h
+++ b/src/smartplaylists/smartplaylistwizard.h
@@ -34,6 +34,7 @@ public:
 
 private slots:
   void AddSearchTerm();
+  void RemoveSearchTerm();
 
 private:
   Ui_SmartPlaylistWizard* ui_;