diff --git a/i18n/fil/cosmic_workspaces.ftl b/i18n/fil/cosmic_workspaces.ftl
new file mode 100644
index 0000000..e69de29
diff --git a/i18n/id/cosmic_workspaces.ftl b/i18n/id/cosmic_workspaces.ftl
index 0aa7228..349d4a7 100644
--- a/i18n/id/cosmic_workspaces.ftl
+++ b/i18n/id/cosmic_workspaces.ftl
@@ -1,2 +1,2 @@
-workspace = Ruang kerja { $number }
+workspace = Ruang Kerja { $number }
 new-workspace = Ruang Kerja Baru
diff --git a/i18n/kmr/cosmic_workspaces.ftl b/i18n/kmr/cosmic_workspaces.ftl
index 862e283..f1087dc 100644
--- a/i18n/kmr/cosmic_workspaces.ftl
+++ b/i18n/kmr/cosmic_workspaces.ftl
@@ -1,2 +1,2 @@
-workspace = Qadanda xebatê { $number }
+workspace = Qada xebatê { $number }
 new-workspace = Qada xebatê nû
diff --git a/src/main.rs b/src/main.rs
index 206437b..4ba8e05 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -887,12 +887,12 @@ impl Application for App {
                                 self.sub_ctr += 1;
 
                                 t.pending_move = Some(workspace.clone());
+                                self.send_wayland_cmd(backend::Cmd::MoveToplevelToWorkspace(
+                                    handle.clone(),
+                                    workspace,
+                                    output,
+                                ));
                             }
-                            self.send_wayland_cmd(backend::Cmd::MoveToplevelToWorkspace(
-                                handle.clone(),
-                                workspace,
-                                output,
-                            ));
                             self.drag_surface = None;
 
                             let to_update: Vec<_> = self