diff --git a/libs/resourcewidgets/KisResourceItemChooserContextMenu.cpp b/libs/resourcewidgets/KisResourceItemChooserContextMenu.cpp
index ce0594b8d8..9140b05486 100644
--- a/libs/resourcewidgets/KisResourceItemChooserContextMenu.cpp
+++ b/libs/resourcewidgets/KisResourceItemChooserContextMenu.cpp
@@ -1,323 +1,347 @@
 
 /* This file is part of the KDE project
  *    Copyright (c) 2013 Sascha Suelzer <s.suelzer@gmail.com>
  *    Copyright (c) 2020 Agata Cacko <cacko.azh@gmail.com>
  *
  *    This library is free software; you can redistribute it and/or
  *    modify it under the terms of the GNU Library General Public
  *    License as published by the Free Software Foundation; either
  *    version 2 of the License, or (at your option) any later version.
  *
  *    This library is distributed in the hope that it will be useful,
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *    Library General Public License for more details.
  *
  *    You should have received a copy of the GNU Library General Public License
  *    along with this library; see the file COPYING.LIB.  If not, write to
  *    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  * Boston, MA 02110-1301, USA.
  * */
 
 #include "KisResourceItemChooserContextMenu.h"
 
 #include <QDebug>
 #include <QLabel>
 #include <QGridLayout>
 
 #include <KoIcon.h>
 #include <klocalizedstring.h>
 #include <KoResource.h>
 #include <KisTagModelProvider.h>
 
 
 #include <KisTag.h>
 
 #include "kis_debug.h"
 
 KoLineEditAction::KoLineEditAction(QObject* parent)
     : QWidgetAction(parent)
     , m_closeParentOnTrigger(false)
 {
     QWidget* pWidget = new QWidget (0);
     QHBoxLayout* pLayout = new QHBoxLayout();
     m_label = new QLabel(0);
     m_editBox = new QLineEdit(0);
     m_editBox->setClearButtonEnabled(true);
     m_AddButton = new QPushButton();
     m_AddButton->setIcon(koIcon("list-add"));
     pLayout->addWidget(m_label);
     pLayout->addWidget(m_editBox);
     pLayout->addWidget(m_AddButton);
     pWidget->setLayout(pLayout);
     setDefaultWidget(pWidget);
 
     connect (m_editBox, &QLineEdit::returnPressed, this, &KoLineEditAction::onTriggered);
     connect (m_AddButton, &QPushButton::clicked, this, &KoLineEditAction::onTriggered);
 }
 
 KoLineEditAction::~KoLineEditAction()
 {
 
 }
 
 void KoLineEditAction::setIcon(const QIcon &icon)
 {
     QPixmap pixmap = QPixmap(icon.pixmap(16,16));
     m_label->setPixmap(pixmap);
 }
 
 void KoLineEditAction::closeParentOnTrigger(bool closeParent)
 {
     m_closeParentOnTrigger = closeParent;
 }
 
 bool KoLineEditAction::closeParentOnTrigger()
 {
     return m_closeParentOnTrigger;
 }
 
 void KoLineEditAction::onTriggered()
 {
     if (! m_editBox->text().isEmpty()) {
         KisTagSP tag(new KisTag());
         tag->setName(m_editBox->text());
         tag->setUrl(m_editBox->text());
         emit triggered(tag);
         m_editBox->text().clear();
 
         if (m_closeParentOnTrigger) {
             this->parentWidget()->close();
             m_editBox->clearFocus();
         }
     }
 }
 
 void KoLineEditAction::setPlaceholderText(const QString& clickMessage)
 {
     m_editBox->setPlaceholderText(clickMessage);
 }
 
 void KoLineEditAction::setText(const QString& text)
 {
     ENTER_FUNCTION();
     m_editBox->setText(text);
 }
 
 void KoLineEditAction::setVisible(bool showAction)
 {
     QLayout* currentLayout = defaultWidget()->layout();
 
     this->QAction::setVisible(showAction);
 
     for(int i=0;i<currentLayout->count();i++) {
         currentLayout->itemAt(i)->widget()->setVisible(showAction);
     }
     defaultWidget()->setVisible(showAction);
 }
 
 ContextMenuExistingTagAction::ContextMenuExistingTagAction(KoResourceSP resource, KisTagSP tag, QObject* parent)
     : QAction(parent)
     , m_resource(resource)
     , m_tag(tag)
 {
     setText(tag->name());
     connect (this, SIGNAL(triggered()),
              this, SLOT(onTriggered()));
 }
 
 ContextMenuExistingTagAction::~ContextMenuExistingTagAction()
 {
 }
 
 void ContextMenuExistingTagAction::onTriggered()
 {
     ENTER_FUNCTION();
     emit triggered(m_resource, m_tag);
 }
 
 NewTagAction::~NewTagAction()
 {
 }
 
 NewTagAction::NewTagAction(KoResourceSP resource, QMenu* parent)
     :KoLineEditAction (parent)
 {
     m_resource = resource;
     setIcon(koIcon("document-new"));
     setPlaceholderText(i18n("New tag"));
     closeParentOnTrigger(true);
 
     connect (this, SIGNAL(triggered(KisTagSP)),
              this, SLOT(onTriggered(KisTagSP)));
 }
 
 void NewTagAction::onTriggered(const KisTagSP tag)
 {
     emit triggered(m_resource,tag);
 }
 
 class CompareWithOtherTagFunctor
 {
     KisTagSP m_referenceTag;
 
 public:
     CompareWithOtherTagFunctor(KisTagSP referenceTag)
     {
         m_referenceTag = referenceTag;
     }
 
     bool operator()(KisTagSP otherTag)
     {
-        return !otherTag.isNull() && otherTag->url() == m_referenceTag->url();
+        ENTER_FUNCTION() << "refTag: " << (m_referenceTag.isNull() ? "null" : m_referenceTag->name())
+                         << " other: " << (otherTag.isNull() ? "null" : otherTag->name())
+                         << " result = " << (!otherTag.isNull() && !m_referenceTag.isNull() && otherTag->url() == m_referenceTag->url());
+        return !otherTag.isNull() && !m_referenceTag.isNull() && otherTag->url() == m_referenceTag->url();
     }
 
     void setReferenceTag(KisTagSP referenceTag) {
         m_referenceTag = referenceTag;
     }
 
+    KisTagSP referenceTag() {
+        return m_referenceTag;
+    }
+
 };
 
 bool compareWithSpecialTags(KisTagSP tag) {
     // TODO: RESOURCES: id < 0? For now, "All" fits
     return !tag.isNull() && tag->id() < 0;
 }
 
 
 
 KisResourceItemChooserContextMenu::KisResourceItemChooserContextMenu(KoResourceSP resource,
                                                                    const KisTagSP currentlySelectedTag)
     : m_resourceType(resource->resourceType().first)
 {
 
     QImage image = resource->image();
     QIcon icon(QPixmap::fromImage(image));
     QAction * label = new QAction(resource->name(), this);
     label->setIcon(icon);
 
     addAction(label);
 
     QMenu * removableTagsMenu;
     QMenu * assignableTagsMenu;
 
     m_tagModel = KisTagModelProvider::tagModel(resource->resourceType().first);
 
 
     QList<KisTagSP> removables = m_tagModel->tagsForResource(resource->resourceId()).toList();
 
     QList<KisTagSP> list;
     for (int i = 0; i < m_tagModel->rowCount(); i++) {
         QModelIndex index = m_tagModel->index(i, 0);
         KisTagSP tag = m_tagModel->tagForIndex(index);
          if (!tag.isNull()) {
              list << tag;
          }
      }
 
     QList<KisTagSP> assignables2 = list;
 
     CompareWithOtherTagFunctor comparer(currentlySelectedTag);
 
     bool currentTagInRemovables = !currentlySelectedTag.isNull();
     currentTagInRemovables = currentTagInRemovables
             && (std::find_if(removables.begin(), removables.end(), comparer) != removables.end());
 
+    ENTER_FUNCTION() << "current tag in removeables: " <<currentTagInRemovables;
+
 
     // remove "All" tag from both "Remove from tag: " and "Assign to tag: " lists
     std::remove_if(removables.begin(), removables.end(), compareWithSpecialTags);
     std::remove_if(assignables2.begin(), assignables2.end(), compareWithSpecialTags);
 
 
     assignableTagsMenu = addMenu(koIcon("list-add"),i18n("Assign to tag"));
 
 
     if (!removables.isEmpty()) {
         addSeparator();
         KisTagSP currentTag = currentlySelectedTag;
 
         if (!currentTag.isNull() && currentTagInRemovables) {
             // remove the current tag from both "Remove from tag: " and "Assign to tag: " lists
-            std::remove_if(removables.begin(), removables.end(), comparer);
-            std::remove_if(assignables2.begin(), assignables2.end(), comparer);
+            ENTER_FUNCTION() << "# remove the current tag from both lists";
+
+            ENTER_FUNCTION() << "now just removeables";
+            ENTER_FUNCTION() << "comparer's tag: " << comparer.referenceTag();
+            QList<QSharedPointer<KisTag> >::iterator b = std::remove_if(removables.begin(), removables.end(), comparer);
+            if (b != removables.end()) {
+                removables.removeAll(*b);
+            }
+            QList<QSharedPointer<KisTag> >::iterator b2 = std::remove_if(assignables2.begin(), assignables2.end(), comparer);
+            if (b2 != assignables2.end()) {
+                assignables2.removeAll(*b2);
+            }
+            ENTER_FUNCTION() << "done. The list now consists of: ";
+            Q_FOREACH(KisTagSP tag, removables) {
+                ENTER_FUNCTION() << tag;
+            }
+            ENTER_FUNCTION() << "end";
 
             ContextMenuExistingTagAction * removeTagAction = new ContextMenuExistingTagAction(resource, currentTag, this);
             removeTagAction->setText(i18n("Remove from this tag"));
             removeTagAction->setIcon(koIcon("list-remove"));
 
             connect(removeTagAction, SIGNAL(triggered(KoResourceSP, const KisTagSP)),
                     this, SLOT(removeResourceExistingTag(KoResourceSP, const KisTagSP)));
             addAction(removeTagAction);
         }
 
         if (!removables.isEmpty()) {
             removableTagsMenu = addMenu(koIcon("list-remove"),i18n("Remove from other tag"));
 
             KisTagSP empty;
             CompareWithOtherTagFunctor compareWithRemovable(empty);
             foreach (const KisTagSP tag, removables) {
 
                 if (tag.isNull()) {
                     continue;
                 }
 
                 compareWithRemovable.setReferenceTag(tag);
                 std::remove_if(assignables2.begin(), assignables2.end(), compareWithRemovable);
 
 
                 ContextMenuExistingTagAction * removeTagAction = new ContextMenuExistingTagAction(resource, tag, this);
 
                 connect(removeTagAction, SIGNAL(triggered(KoResourceSP, const KisTagSP)),
                         this, SLOT(removeResourceExistingTag(KoResourceSP, const KisTagSP)));
                 removableTagsMenu->addAction(removeTagAction);
             }
         }
 
     }
 
 
     foreach (const KisTagSP &tag, assignables2) {
         if (tag.isNull()) {
             continue;
         }
 
         ContextMenuExistingTagAction * addTagAction = new ContextMenuExistingTagAction(resource, tag, this);
 
         connect(addTagAction, SIGNAL(triggered(KoResourceSP, const KisTagSP)),
                 this, SLOT(addResourceTag(KoResourceSP, const KisTagSP)));
 
 
         assignableTagsMenu->addAction(addTagAction);
     }
 
     assignableTagsMenu->addSeparator();
 
     NewTagAction * addTagAction = new NewTagAction(resource, this);
     connect(addTagAction, SIGNAL(triggered(KoResourceSP, const KisTagSP)),
             this, SLOT(addResourceNewTag(KoResourceSP, const KisTagSP)));
     assignableTagsMenu->addAction(addTagAction);
 
 }
 
 KisResourceItemChooserContextMenu::~KisResourceItemChooserContextMenu()
 {
 
 }
 
 
 void KisResourceItemChooserContextMenu::addResourceTag(KoResourceSP resource, const KisTagSP tag)
 {
     m_tagModel->tagResource(tag, resource);
 }
 
 void KisResourceItemChooserContextMenu::removeResourceExistingTag(KoResourceSP resource, const KisTagSP tag)
 {
     m_tagModel->untagResource(tag, resource);
 }
 
 void KisResourceItemChooserContextMenu::addResourceNewTag(KoResourceSP resource, const KisTagSP tag)
 {
     QString name = tag->name().isEmpty() ? tag->url() : tag->name();
     QVector<KoResourceSP> resourceList;
     resourceList << resource;
     m_tagModel->addEmptyTag(tag, resourceList);
 }