diff --git a/declarativeimports/core/CMakeLists.txt b/declarativeimports/core/CMakeLists.txt
index ad5fa0939..550c78f7f 100644
--- a/declarativeimports/core/CMakeLists.txt
+++ b/declarativeimports/core/CMakeLists.txt
@@ -2,6 +2,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-latte-lib.h.cmake ${CMAKE_CURR
 
 set(lattecoreplugin_SRCS
     lattecoreplugin.cpp
+    dialog.cpp
     environment.cpp
     iconitem.cpp
     quickwindowsystem.cpp
diff --git a/plasmoid/plugin/dialog.cpp b/declarativeimports/core/dialog.cpp
similarity index 100%
rename from plasmoid/plugin/dialog.cpp
rename to declarativeimports/core/dialog.cpp
diff --git a/plasmoid/plugin/dialog.h b/declarativeimports/core/dialog.h
similarity index 100%
rename from plasmoid/plugin/dialog.h
rename to declarativeimports/core/dialog.h
diff --git a/declarativeimports/core/lattecoreplugin.cpp b/declarativeimports/core/lattecoreplugin.cpp
index 82a6d02b4..caa447a7d 100644
--- a/declarativeimports/core/lattecoreplugin.cpp
+++ b/declarativeimports/core/lattecoreplugin.cpp
@@ -21,6 +21,7 @@
 #include "lattecoreplugin.h"
 
 // local
+#include "dialog.h"
 #include "environment.h"
 #include "iconitem.h"
 #include "quickwindowsystem.h"
@@ -37,6 +38,7 @@ void LatteCorePlugin::registerTypes(const char *uri)
     Q_ASSERT(uri == QLatin1String("org.kde.latte.core"));
     qmlRegisterUncreatableType<Latte::Types>(uri, 0, 2, "Types", "Latte Types uncreatable");
     qmlRegisterType<Latte::IconItem>(uri, 0, 2, "IconItem");
+    qmlRegisterType<Latte::Quick::Dialog>(uri, 0, 2, "Dialog");
     qmlRegisterSingletonType<Latte::Environment>(uri, 0, 2, "Environment", &Latte::environment_qobject_singletontype_provider);
     qmlRegisterSingletonType<Latte::Tools>(uri, 0, 2, "Tools", &Latte::tools_qobject_singletontype_provider);
     qmlRegisterSingletonType<Latte::QuickWindowSystem>(uri, 0, 2, "WindowSystem", &Latte::windowsystem_qobject_singletontype_provider);
diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt
index ad01e9460..95f808aef 100644
--- a/plasmoid/CMakeLists.txt
+++ b/plasmoid/CMakeLists.txt
@@ -5,7 +5,6 @@ configure_file(metadata.desktop.cmake ${CMAKE_CURRENT_SOURCE_DIR}/package/metada
 plasma_install_package(package org.kde.latte.plasmoid)
 
 set(tasks_SRCS
-    plugin/dialog.cpp
     plugin/types.cpp
     plugin/lattetasksplugin.cpp
 )
diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml
index 2420de631..93ab58a35 100644
--- a/plasmoid/package/contents/ui/main.qml
+++ b/plasmoid/package/contents/ui/main.qml
@@ -336,7 +336,7 @@ Item {
 
     ////BEGIN interfaces
 
-    LatteTasks.Dialog{
+    LatteCore.Dialog{
         id: windowsPreviewDlg
         type: plasmoid.configuration.previewWindowAsPopup ? PlasmaCore.Dialog.PopupMenu : PlasmaCore.Dialog.Tooltip
         flags: plasmoid.configuration.previewWindowAsPopup ? Qt.WindowStaysOnTopHint | Qt.WindowDoesNotAcceptFocus | Qt.Popup :
diff --git a/plasmoid/plugin/lattetasksplugin.cpp b/plasmoid/plugin/lattetasksplugin.cpp
index 3a0354f0b..c0b59f716 100644
--- a/plasmoid/plugin/lattetasksplugin.cpp
+++ b/plasmoid/plugin/lattetasksplugin.cpp
@@ -20,7 +20,6 @@
 #include "lattetasksplugin.h"
 
 // local
-#include "dialog.h"
 #include "types.h"
 
 // Qt
@@ -31,6 +30,5 @@ void LatteTasksPlugin::registerTypes(const char *uri)
 {
     Q_ASSERT(uri == QLatin1String("org.kde.latte.private.tasks"));
     qmlRegisterUncreatableType<Latte::Tasks::Types>(uri, 0, 1, "Types", "Latte Tasks Types uncreatable");
-    qmlRegisterType<Latte::Quick::Dialog>(uri, 0, 1, "Dialog");
 }
 
diff --git a/shell/package/contents/applet/CompactApplet.qml b/shell/package/contents/applet/CompactApplet.qml
index 76a02a879..3a13ec005 100644
--- a/shell/package/contents/applet/CompactApplet.qml
+++ b/shell/package/contents/applet/CompactApplet.qml
@@ -23,6 +23,8 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 
+import org.kde.latte.core 0.2 as LatteCore
+
 PlasmaCore.ToolTipArea {
     id: root
     objectName: "org.kde.desktop-CompactApplet"
@@ -145,7 +147,7 @@ PlasmaCore.ToolTipArea {
         function onContextualActionsAboutToShow() { root.hideToolTip() }
     }
 
-    PlasmaCore.Dialog {
+    LatteCore.Dialog {
         id: popupWindow
         objectName: "popupWindow"
         flags: Qt.WindowStaysOnTopHint