diff --git a/multiscreen-compositor/qml/main.qml b/multiscreen-compositor/qml/main.qml
index 22c398958b607b6bcc38230b20ed4e6f90b09fa2..6877152fd2dcacb848c572f9606d5323f90c15db 100644
--- a/multiscreen-compositor/qml/main.qml
+++ b/multiscreen-compositor/qml/main.qml
@@ -488,7 +488,16 @@ WaylandCompositor {
         function onGetScreen(windowid){
             cleanUpApplist();
             console.log("Received a getScreen Signal for window ID: ", windowid)
-            server.returnStatus(getScreenFromIviId(windowid))
+            var screenid = getScreenFromIviId(windowid);
+            if (screenid >= 0)
+            {
+                server.returnStatus(0)
+                server.sendMessage("Screen", windowid, screenid);
+            }
+            else
+            {
+                server.returnStatus(screenid)
+            }
         }
 
         // This seems to be unused.