diff --git a/src/wayland/output_interface.cpp b/src/wayland/output_interface.cpp
index 9f752f8f4d..df23a4b472 100644
--- a/src/wayland/output_interface.cpp
+++ b/src/wayland/output_interface.cpp
@@ -337,6 +337,8 @@ void OutputInterface::Private::bind(wl_client *client, uint32_t version, uint32_
 
     sendDone(r);
     c->flush();
+
+    emit q->bound(display->getConnection(client), r.resource);
 }
 
 void OutputInterface::Private::unbind(wl_resource *resource)
diff --git a/src/wayland/output_interface.h b/src/wayland/output_interface.h
index 13dbedce1c..f800f827a4 100644
--- a/src/wayland/output_interface.h
+++ b/src/wayland/output_interface.h
@@ -148,6 +148,12 @@ Q_SIGNALS:
      **/
     void dpmsModeRequested(KWaylandServer::OutputInterface::DpmsMode mode);
 
+    /**
+     * Emitted when a client binds to a given output
+     * @internal
+     */
+    void bound(ClientConnection *client,  wl_resource *boundResource);
+
 private:
     class Private;
     Private *d_func() const;
diff --git a/src/wayland/surface_interface.cpp b/src/wayland/surface_interface.cpp
index 2f1a736534..c6762ff59f 100644
--- a/src/wayland/surface_interface.cpp
+++ b/src/wayland/surface_interface.cpp
@@ -832,6 +832,7 @@ void SurfaceInterface::setOutputs(const QVector<OutputInterface *> &outputs)
             d->send_leave(outputResource);
         }
         disconnect(d->outputDestroyedConnections.take(*it));
+        disconnect(d->outputBoundConnections.take(*it));
     }
     QVector<OutputInterface *> addedOutputsOutputs = outputs;
     for (auto it = d->outputs.constBegin(), end = d->outputs.constEnd(); it != end; ++it) {
@@ -849,8 +850,15 @@ void SurfaceInterface::setOutputs(const QVector<OutputInterface *> &outputs)
             if (outputs.removeOne(o)) {
                 setOutputs(outputs);
             }});
+
+        Q_ASSERT(!d->outputBoundConnections.contains(o));
+        d->outputBoundConnections[o] = connect(o, &OutputInterface::bound, this, [this](ClientConnection *c, wl_resource *outputResource) {
+            if (c != client()) {
+                return;
+            }
+            d->send_enter(outputResource);
+        });
     }
-    // TODO: send enter when the client binds the OutputInterface another time
 
     d->outputs = outputs;
     for (auto child : d->current.children) {
diff --git a/src/wayland/surface_interface_p.h b/src/wayland/surface_interface_p.h
index c1a14a3d78..79631c3f6c 100644
--- a/src/wayland/surface_interface_p.h
+++ b/src/wayland/surface_interface_p.h
@@ -117,6 +117,8 @@ public:
     LockedPointerV1Interface *lockedPointer = nullptr;
     ConfinedPointerV1Interface *confinedPointer = nullptr;
     QHash<OutputInterface*, QMetaObject::Connection> outputDestroyedConnections;
+    QHash<OutputInterface*, QMetaObject::Connection> outputBoundConnections;
+
     QVector<IdleInhibitorV1Interface*> idleInhibitors;
     ViewportInterface *viewportExtension = nullptr;
     SurfaceInterface *dataProxy = nullptr;