diff --git a/cockatrice/src/dlg_create_token.cpp b/cockatrice/src/dlg_create_token.cpp
index 02c867bb..7bf320ed 100644
--- a/cockatrice/src/dlg_create_token.cpp
+++ b/cockatrice/src/dlg_create_token.cpp
@@ -23,6 +23,7 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa
     nameLabel = new QLabel(tr("&Name:"));
     nameEdit = new QLineEdit(tr("Token"));
     nameEdit->selectAll();
+    connect(nameEdit, SIGNAL(textChanged(const QString &)), this, SLOT(updateSearch(const QString &)));
     nameLabel->setBuddy(nameEdit);
 
     colorLabel = new QLabel(tr("C&olor:"));
@@ -135,7 +136,7 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
     
     if(cardInfo)
     {
-        nameEdit->setText(cardInfo->getName());
+        updateSearchFieldWithoutUpdatingFilter(cardInfo->getName());
         const QChar cardColor = cardInfo->getColorChar();
         colorEdit->setCurrentIndex(colorEdit->findData(cardColor, Qt::UserRole, Qt::MatchFixedString));
         ptEdit->setText(cardInfo->getPowTough());
@@ -149,6 +150,17 @@ void DlgCreateToken::tokenSelectionChanged(const QModelIndex &current, const QMo
     }
 }
 
+void DlgCreateToken::updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const {
+    nameEdit->blockSignals(true);
+    nameEdit->setText(newValue);
+    nameEdit->blockSignals(false);
+}
+
+void DlgCreateToken::updateSearch(const QString &search)
+{
+    cardDatabaseDisplayModel->setCardName(search);
+}
+
 void DlgCreateToken::actChooseTokenFromAll(bool checked)
 {
     if (checked)
diff --git a/cockatrice/src/dlg_create_token.h b/cockatrice/src/dlg_create_token.h
index 26589742..ec212471 100644
--- a/cockatrice/src/dlg_create_token.h
+++ b/cockatrice/src/dlg_create_token.h
@@ -25,6 +25,7 @@ public:
     bool getDestroy() const;
 private slots:
     void tokenSelectionChanged(const QModelIndex &current, const QModelIndex &previous);
+    void updateSearch(const QString &search);
     void actChooseTokenFromAll(bool checked);
     void actChooseTokenFromDeck(bool checked);
     void actOk();
@@ -37,6 +38,8 @@ private:
     QLineEdit *nameEdit, *ptEdit, *annotationEdit;
     QCheckBox *destroyCheckBox;
     QRadioButton *chooseTokenFromAllRadioButton, *chooseTokenFromDeckRadioButton;
+
+    void updateSearchFieldWithoutUpdatingFilter(const QString &newValue) const;
 };
 
 #endif