diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 27e2c6c34..90cb3cdab 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -17,7 +17,6 @@ find_package(KF5CoreAddons REQUIRED)
 find_package(KF5Crash REQUIRED)
 find_package(KF5Solid REQUIRED)
 find_package(KF5Activities REQUIRED)
-find_package(KF5KDE4Support REQUIRED)
 find_package(KF5TextEditor REQUIRED)
 
 
@@ -75,7 +74,6 @@ target_link_libraries(plasma-shell
  KF5::Activities
  KF5::GlobalAccel
  KF5::DBusAddons
- KF5::KDE4Support
  KF5::TextEditor
 )
 target_include_directories(plasma-shell PRIVATE "${CMAKE_BINARY_DIR}")
diff --git a/src/shell/interactiveconsole.cpp b/src/shell/interactiveconsole.cpp
index 856ab5ec0..84bb5b34a 100644
--- a/src/shell/interactiveconsole.cpp
+++ b/src/shell/interactiveconsole.cpp
@@ -45,7 +45,6 @@
 #include <KTextEditor/Document>
 #include <KTextEditor/View>
 #include <KToolBar>
-#include <KComponentData>
 
 #include <Plasma/Corona>
 #include <Plasma/Package>
@@ -348,7 +347,7 @@ void InteractiveConsole::populateTemplatesMenu()
 
     QMap<QString, KService::Ptr> sorted;
     const QString constraint = QString("[X-Plasma-Shell] == '%1'")
-                                      .arg(KComponentData::mainComponent().componentName());
+                                      .arg(qApp->applicationName());
     KService::List templates = KServiceTypeTrader::self()->query("Plasma/LayoutTemplate", constraint);
     foreach (const KService::Ptr &service, templates) {
         sorted.insert(service->name(), service);