diff --git a/scripts/bin/disable-laptop-keyboard b/scripts/bin/disable-laptop-keyboard
index 56bb997..223d1f6 100755
--- a/scripts/bin/disable-laptop-keyboard
+++ b/scripts/bin/disable-laptop-keyboard
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 
-sudo xinput float 15
+KEYBOARD_SEARCH_STRING="AT Translated.*keyboard"
+BUILTIN_KEYBOARD_ID=$(xinput list | grep "$KEYBOARD_SEARCH_STRING" | sed -ne 's/^.*id\=\([0-9]*\).*/\1/p')
+sudo xinput float "$BUILTIN_KEYBOARD_ID"
diff --git a/scripts/bin/enable-laptop-keyboard b/scripts/bin/enable-laptop-keyboard
index 2aabb77..59149cc 100755
--- a/scripts/bin/enable-laptop-keyboard
+++ b/scripts/bin/enable-laptop-keyboard
@@ -1,3 +1,8 @@
 #!/usr/bin/env bash
 
-sudo xinput reattach 15 3
+KEYBOARD_PARENT_SEARCH_STRING="Virtual core keyboard.*master keyboard"
+PARENT_KEYBOARD_ID=$(xinput list | grep "$KEYBOARD_PARENT_SEARCH_STRING" | sed -ne 's/^.*id\=\([0-9]*\).*/\1/p')
+
+KEYBOARD_SEARCH_STRING="AT Translated.*keyboard"
+BUILTIN_KEYBOARD_ID=$(xinput list | grep "$KEYBOARD_SEARCH_STRING" | sed -ne 's/^.*id\=\([0-9]*\).*/\1/p')
+sudo xinput reattach "$BUILTIN_KEYBOARD_ID" "$PARENT_KEYBOARD_ID"