diff --git a/src/effects/desktopgrid/qml/DesktopView.qml b/src/effects/desktopgrid/qml/DesktopView.qml
index 4d88ac9e99..d75734ce26 100644
--- a/src/effects/desktopgrid/qml/DesktopView.qml
+++ b/src/effects/desktopgrid/qml/DesktopView.qml
@@ -121,13 +121,14 @@ DropArea {
         }
         onActivated: effect.deactivate(effect.animationDuration);
         onWindowClicked: {
-            if (eventPoint.event.button !== Qt.MiddleButton) {
-                return;
-            }
-            if (window.desktop > -1) {
-                window.desktop = -1;
-            } else {
-                window.desktop = desktopView.desktop.x11DesktopNumber;
+            if (eventPoint.event.button === Qt.MiddleButton) {
+                window.closeWindow();
+            } else if (eventPoint.event.button === Qt.RightButton) {
+                if (window.desktop > -1) {
+                    window.desktop = -1;
+                } else {
+                    window.desktop = desktopView.desktop.x11DesktopNumber;
+                }
             }
         }
         Behavior on x {