diff --git a/src/api/wayfire/unstable/wlr-text-input-v3-popup.hpp b/src/api/wayfire/unstable/wlr-text-input-v3-popup.hpp
index 094608144..bc8394d6d 100644
--- a/src/api/wayfire/unstable/wlr-text-input-v3-popup.hpp
+++ b/src/api/wayfire/unstable/wlr-text-input-v3-popup.hpp
@@ -39,6 +39,7 @@ class text_input_v3_popup : public wf::view_interface_t
   private:
     wf::geometry_t geometry{0, 0, 0, 0};
     wlr_box old_cursor_rect{0, 0, 0, 0};
+    wf::dimensions_t last_size{0, 0};
     std::shared_ptr<wf::scene::wlr_surface_node_t> main_surface;
     std::shared_ptr<wf::scene::translation_node_t> surface_root_node;
 
diff --git a/src/core/seat/input-method-popup.cpp b/src/core/seat/input-method-popup.cpp
index 4eb83cdfa..429708a08 100644
--- a/src/core/seat/input-method-popup.cpp
+++ b/src/core/seat/input-method-popup.cpp
@@ -169,6 +169,7 @@ void wf::text_input_v3_popup::update_geometry()
     // make sure top edge is on screen, sliding down and sacrificing down edge if unavoidable
     y = std::max(0, y);
 
+    auto last_offset = surface_root_node->get_offset();
     surface_root_node->set_offset({x, y});
     geometry.x     = x;
     geometry.y     = y;
@@ -176,6 +177,15 @@ void wf::text_input_v3_popup::update_geometry()
     geometry.height = height;
     damage();
     wf::scene::update(get_surface_root_node(), wf::scene::update_flag::GEOMETRY);
+    wf::scene::damage_node(get_surface_root_node(), geometry);
+
+    wf::geometry_t last_geometry{last_offset.x, last_offset.y, last_size.width, last_size.height};
+    if (last_geometry != geometry)
+    {
+        wf::scene::damage_node(get_surface_root_node(), last_geometry);
+    }
+
+    last_size = {width, height};
 }
 
 bool wf::text_input_v3_popup::is_mapped() const