diff --git a/src/core/txn/transaction-manager-impl.hpp b/src/core/txn/transaction-manager-impl.hpp
index fc38601ac..11104531b 100644
--- a/src/core/txn/transaction-manager-impl.hpp
+++ b/src/core/txn/transaction-manager-impl.hpp
@@ -1,7 +1,6 @@
 #include "wayfire/signal-provider.hpp"
 #include "wayfire/txn/transaction.hpp"
 #include <algorithm>
-#include <iterator>
 #include <wayfire/txn/transaction-manager.hpp>
 #include <wayfire/debug.hpp>
 
diff --git a/src/view/xdg-shell/xdg-toplevel-view.cpp b/src/view/xdg-shell/xdg-toplevel-view.cpp
index 50216e79a..0bced558c 100644
--- a/src/view/xdg-shell/xdg-toplevel-view.cpp
+++ b/src/view/xdg-shell/xdg-toplevel-view.cpp
@@ -323,8 +323,7 @@ void wf::xdg_toplevel_view_t::handle_toplevel_state_changed(wf::toplevel_state_t
     wf::view_implementation::emit_toplevel_state_change_signals({this}, old_state);
     scene::update(this->get_surface_root_node(), scene::update_flag::GEOMETRY);
 
-    if (!wf::get_core().tx_manager->is_object_committed(wtoplevel) &&
-        !wf::get_core().tx_manager->is_object_pending(wtoplevel))
+    if (!wf::get_core().tx_manager->is_object_pending(wtoplevel))
     {
         // Drop self-ref => `this` might get deleted
         _self_ref.reset();
diff --git a/src/view/xwayland/xwayland-toplevel-view.hpp b/src/view/xwayland/xwayland-toplevel-view.hpp
index a25d5f7c9..675a4af15 100644
--- a/src/view/xwayland/xwayland-toplevel-view.hpp
+++ b/src/view/xwayland/xwayland-toplevel-view.hpp
@@ -463,8 +463,7 @@ class wayfire_xwayland_view : public wf::toplevel_view_interface_t, public wayfi
         wf::view_implementation::emit_toplevel_state_change_signals({this}, old_state);
         wf::scene::update(this->get_surface_root_node(), wf::scene::update_flag::GEOMETRY);
 
-        if (!wf::get_core().tx_manager->is_object_committed(toplevel) &&
-            !wf::get_core().tx_manager->is_object_pending(toplevel))
+        if (!wf::get_core().tx_manager->is_object_pending(toplevel))
         {
             // Drop self-reference => object might be deleted afterwards
             _self_ref.reset();