diff --git a/src/shell/element/stack.rs b/src/shell/element/stack.rs
index 34e6f876..17397153 100644
--- a/src/shell/element/stack.rs
+++ b/src/shell/element/stack.rs
@@ -1723,19 +1723,10 @@ impl PointerTarget<State> for CosmicStack {
                         false,
                     );
                     if let Some((grab, focus)) = res {
-                        match grab.grab_type() {
-                            GrabType::Touch => {
-                                seat.get_touch().unwrap().set_grab(state, grab, serial)
-                            }
-                            GrabType::Pointer => seat
-                                .get_pointer()
+                        if let GrabType::Pointer = grab.grab_type() {
+                            seat.get_pointer()
                                 .unwrap()
-                                .set_grab(state, grab, serial, focus),
-                            GrabType::TabletTool => seat
-                                .tablet_seat()
-                                .get_tool(grab.tool().unwrap())
-                                .unwrap()
-                                .set_grab(state, grab, InputTime::now(), serial, focus),
+                                .set_grab(state, grab, serial, focus);
                         }
                     }
                 });
@@ -1793,19 +1784,10 @@ impl PointerTarget<State> for CosmicStack {
                         false,
                     );
                     if let Some((grab, focus)) = res {
-                        match grab.grab_type() {
-                            GrabType::Touch => {
-                                seat.get_touch().unwrap().set_grab(state, grab, serial)
-                            }
-                            GrabType::Pointer => seat
-                                .get_pointer()
+                        if let GrabType::Pointer = grab.grab_type() {
+                            seat.get_pointer()
                                 .unwrap()
-                                .set_grab(state, grab, serial, focus),
-                            GrabType::TabletTool => seat
-                                .tablet_seat()
-                                .get_tool(grab.tool().unwrap())
-                                .unwrap()
-                                .set_grab(state, grab, InputTime::now(), serial, focus),
+                                .set_grab(state, grab, serial, focus);
                         }
                     }
                 });
diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs
index 846d9da4..903a2c05 100644
--- a/src/shell/element/window.rs
+++ b/src/shell/element/window.rs
@@ -1114,19 +1114,10 @@ impl PointerTarget<State> for CosmicWindow {
                     );
 
                     if let Some((grab, focus)) = res {
-                        match grab.grab_type() {
-                            GrabType::Touch => {
-                                seat.get_touch().unwrap().set_grab(state, grab, serial)
-                            }
-                            GrabType::Pointer => seat
-                                .get_pointer()
+                        if let GrabType::Pointer = grab.grab_type() {
+                            seat.get_pointer()
                                 .unwrap()
-                                .set_grab(state, grab, serial, focus),
-                            GrabType::TabletTool => seat
-                                .tablet_seat()
-                                .get_tool(grab.tool().unwrap())
-                                .unwrap()
-                                .set_grab(state, grab, InputTime::now(), serial, focus),
+                                .set_grab(state, grab, serial, focus)
                         }
                     }
                 });