diff --git a/qml/windowed/IconItemDelegate.qml b/qml/windowed/IconItemDelegate.qml
index c4133d0c..11d848f5 100644
--- a/qml/windowed/IconItemDelegate.qml
+++ b/qml/windowed/IconItemDelegate.qml
@@ -88,6 +88,11 @@ Control {
                             })
                         }
                     }
+                    onClicked: {
+                        if (!drag.active) {
+                            root.itemClicked()
+                        }
+                    }
                 }
             }
 
@@ -120,12 +125,6 @@ Control {
             radius: 8
             button: iconButton
         }
-
-        // FIXME: This event never get triggered if and only if the DragHandler is enabled,
-        //        which is not expected. This is a workaround for now.
-        onClicked: {
-            root.itemClicked()
-        }
     }
     background: DebugBounding { }