diff --git a/hypr/keybinds.conf b/hypr/keybinds.conf
index 4a5c632..14a6340 100644
--- a/hypr/keybinds.conf
+++ b/hypr/keybinds.conf
@@ -22,7 +22,6 @@ bind = $mainMod, I, exec, pamixer -i 10
 bind = $mainMod, minus, exec, pamixer -d 10
 bind = $mainMod, space, exec, playerctl play-pause
 bind = $mainMod, K, exec, $onscreenkeyboard
-bind = $mainMod SHIFT, K, exec, killall $onscreenkeyboard
 # ------------------- for xf86AudioVolumes -----------
 bind = , XF86AudioLowerVolume, exec, pamixer -d 5
 bind = , XF86AudioRaiseVolume, exec, pamixer -i 5
diff --git a/hypr/programs.conf b/hypr/programs.conf
index cc46f46..b9fd12f 100644
--- a/hypr/programs.conf
+++ b/hypr/programs.conf
@@ -7,5 +7,5 @@ $locker = hyprlock
 $browser = google-chrome-stable
 $clipboard = ~/dotfiles/rofi/clipboard/clipboard.sh 
 $emojipicker = ~/dotfiles/rofi/emoji/rofimoji.sh
-$onscreenkeyboard = wvkbd-mobintl
+$onscreenkeyboard = ~/dotfiles/toggle_keyboard.sh
 #----------------------------------------------------------------
diff --git a/toggle_keyboard.sh b/toggle_keyboard.sh
new file mode 100755
index 0000000..a7c89b8
--- /dev/null
+++ b/toggle_keyboard.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+if [ ! -f ~/.keyboard_started ]; then
+	wvkbd-mobintl &
+	touch ~/.keyboard_started
+else
+	killall wvkbd-mobintl
+	rm ~/.keyboard_started
+fi
+
diff --git a/waybar/config b/waybar/config
index b4d57e9..4b02842 100644
--- a/waybar/config
+++ b/waybar/config
@@ -2,7 +2,7 @@
     "layer": "top",
     "height": 30,
     "spacing": 4,
-    "modules-left": ["custom/launcher", "cpu", "memory", "temperature", "disk", "custom/weather", "custom/updates", "hyprland/window"],
+    "modules-left": ["custom/launcher", "cpu", "memory", "temperature", "disk", "custom/weather", "custom/updates", "custom/onscreenkeyboard", "hyprland/window"],
     "modules-center": ["hyprland/workspaces"],
     "modules-right": ["privacy", "mpris", "cava", "pulseaudio/slider", "pulseaudio", "bluetooth", "network", "backlight", "keyboard-state", "hyprland/language", "battery", "battery#bat2", "clock", "tray", "custom/power"],
     "hyprland/workspaces": {
@@ -136,6 +136,10 @@
        "exec-if": "which waybar-module-pacman-updates",
        "exec": "waybar-module-pacman-updates  --interval-seconds 5 --network-interval-seconds 300"
    },
+   "custom/onscreenkeyboard": {
+        "format": "onscrkeyboard",
+        "exec": "~/dotfiles/toggle_keyboard.sh"
+    },
    "bluetooth": {
         "format": " {status}",
         "format-no-controller": "",