diff --git a/plugins/single_plugins/oswitch.cpp b/plugins/single_plugins/oswitch.cpp
index 538be72e0..996af382d 100644
--- a/plugins/single_plugins/oswitch.cpp
+++ b/plugins/single_plugins/oswitch.cpp
@@ -21,6 +21,7 @@ class wayfire_oswitch : public wf::plugin_interface_t
         idle_next_output.run_once([=] ()
         {
             wf::get_core().seat->focus_output(next);
+            next->ensure_pointer(true);
         });
 
         return true;
@@ -43,6 +44,7 @@ class wayfire_oswitch : public wf::plugin_interface_t
         idle_next_output.run_once([=] ()
         {
             wf::get_core().seat->focus_output(next);
+            next->ensure_pointer(true);
         });
 
         return true;
diff --git a/src/core/seat/seat.cpp b/src/core/seat/seat.cpp
index 103c6c343..c04f448d6 100644
--- a/src/core/seat/seat.cpp
+++ b/src/core/seat/seat.cpp
@@ -58,8 +58,6 @@ void wf::seat_t::focus_output(wf::output_t *wo)
     if (wo)
     {
         LOGC(KBD, "focus output: ", wo->handle->name);
-        /* Move to the middle of the output if this is the first output */
-        wo->ensure_pointer((priv->active_output == nullptr));
 
         refocus();