diff --git a/app/dockview.cpp b/app/dockview.cpp
index e72212717..8d483fc87 100644
--- a/app/dockview.cpp
+++ b/app/dockview.cpp
@@ -578,6 +578,10 @@ void DockView::mousePressEvent(QMouseEvent *event)
             }
         }
 
+        if (!applet) {
+            applet = containment();
+        }
+
         if (applet) {
             KPluginMetaData meta = applet->kPackage().metadata();
 
diff --git a/plasmoid/contents/ui/main.qml b/plasmoid/contents/ui/main.qml
index d92a7deee..784ec3833 100644
--- a/plasmoid/contents/ui/main.qml
+++ b/plasmoid/contents/ui/main.qml
@@ -587,7 +587,9 @@ Item {
 
             target: icList
 
-            property int maxSize: root.statesLineSize + root.iconSize + root.iconMargin - 1
+            property int maxSize: (root.hoveredIndex>=0 && !root.dragSource) ?
+                                      root.statesLineSize + root.zoomFactor * (root.iconSize + root.iconMargin) - 1 :
+                                      root.statesLineSize + root.iconSize + root.iconMargin - 1
 
             onUrlsDropped: {
                 // If all dropped URLs point to application desktop files, we'll add a launcher for each of them.