diff --git a/kcms/icons/iconsmodel.cpp b/kcms/icons/iconsmodel.cpp
--- a/kcms/icons/iconsmodel.cpp
+++ b/kcms/icons/iconsmodel.cpp
@@ -79,12 +79,6 @@
             item.pendingDeletion = pendingDeletion;
             emit dataChanged(index, index, {PendingDeletionRole});
 
-            // move to the next non-pending theme
-            const auto nonPending = match(index, PendingDeletionRole, false);
-            if (!nonPending.isEmpty()) {
-                setSelectedTheme(nonPending.first().data(ThemeNameRole).toString());
-            }
-
             emit pendingDeletionsChanged();
             return true;
         }
diff --git a/kcms/icons/main.cpp b/kcms/icons/main.cpp
--- a/kcms/icons/main.cpp
+++ b/kcms/icons/main.cpp
@@ -148,6 +148,7 @@
     m_model->load();
     m_model->setSelectedTheme(KIconTheme::current());
     updateNeedsSave();
+    emit m_model->selectedThemeChanged();
 }
 
 void IconModule::save()
diff --git a/kcms/icons/package/contents/ui/main.qml b/kcms/icons/package/contents/ui/main.qml
--- a/kcms/icons/package/contents/ui/main.qml
+++ b/kcms/icons/package/contents/ui/main.qml
@@ -153,7 +153,7 @@
             Kirigami.Action {
                 iconName: "edit-delete"
                 tooltip: i18n("Remove Icon Theme")
-                enabled: model.removable
+                enabled: model.removable && model.themeName !== kcm.iconsModel.selectedTheme
                 visible: !model.pendingDeletion
                 onTriggered: model.pendingDeletion = true
             },