diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index af529f3f..f14f911c 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -1048,6 +1048,8 @@ public class ComposerWidget : Gtk.EventBox {
     }
     
     private void on_detach() {
+        if (state == ComposerState.DETACHED)
+            return;
         Gtk.Widget? focus = container.remove_composer();
         ComposerWindow window = new ComposerWindow(this);
         if (focus != null) {