diff --git a/libs/widgets/KoResourceItemChooserContextMenu.h b/libs/widgets/KoResourceItemChooserContextMenu.h
--- a/libs/widgets/KoResourceItemChooserContextMenu.h
+++ b/libs/widgets/KoResourceItemChooserContextMenu.h
@@ -24,9 +24,9 @@
 #include <QMenu>
 #include <QWidgetAction>
 #include <QLabel>
-#include <qlineedit.h>
+#include <QLineEdit>
+#include <QPushButton>
 
-class QLineEdit;
 class KoResource;
 
 
@@ -75,6 +75,7 @@
     bool m_closeParentOnTrigger;
     QLabel * m_label;
     QLineEdit * m_editBox;
+    QPushButton * m_AddButton;
 };
 
 class NewTagAction : public KoLineEditAction
diff --git a/libs/widgets/KoResourceItemChooserContextMenu.cpp b/libs/widgets/KoResourceItemChooserContextMenu.cpp
--- a/libs/widgets/KoResourceItemChooserContextMenu.cpp
+++ b/libs/widgets/KoResourceItemChooserContextMenu.cpp
@@ -26,7 +26,6 @@
 
 #include <KoIcon.h>
 #include <klocalizedstring.h>
-#include <qlineedit.h>
 
 #include <resources/KoResource.h>
 
@@ -38,13 +37,17 @@
     QHBoxLayout* pLayout = new QHBoxLayout();
     m_label = new QLabel(0);
     m_editBox = new QLineEdit(0);
+    m_editBox->setClearButtonEnabled(true);
+    m_AddButton = new QPushButton(i18n("Add"));
     pLayout->addWidget(m_label);
     pLayout->addWidget(m_editBox);
+    pLayout->addWidget(m_AddButton);
     pWidget->setLayout(pLayout);
+    pWidget->setToolTip(i18nc("@info:tooltip", "Enter new tag and press Enter or push Add"));
     setDefaultWidget(pWidget);
 
-    connect (m_editBox, SIGNAL(returnPressed()),
-             this, SLOT(onTriggered()));
+    connect (m_editBox, &QLineEdit::returnPressed, this, &KoLineEditAction::onTriggered);
+    connect (m_AddButton, &QPushButton::clicked, this, &KoLineEditAction::onTriggered);
 }
 
 KoLineEditAction::~KoLineEditAction()