diff --git a/modules/features/hyprland/default.nix b/modules/features/hyprland/default.nix
index 41d3efb..833aab5 100644
--- a/modules/features/hyprland/default.nix
+++ b/modules/features/hyprland/default.nix
@@ -14,6 +14,7 @@
     modules = with self.nixosModules; [
       audio
       systemTheme
+			quickshell
     ];
 
     runtimePkgs = self'.packages.hyprland.passthru.runtimePackages;
diff --git a/modules/features/quickshell/default.nix b/modules/features/quickshell/default.nix
index dba12eb..bca84f9 100644
--- a/modules/features/quickshell/default.nix
+++ b/modules/features/quickshell/default.nix
@@ -7,10 +7,20 @@
     self',
     pkgs,
     ...
-  }: {
-    environment.systemPackages = with self'.packages; [
-      quickshell
-    ];
+  }: {config, ...}: {
+    environment.systemPackages = with self'.packages;
+      [
+        quickshell
+      ]
+      ++ (
+        if config.hyprland.enablePlugins == true
+        then
+				# If on tablet enable on screen keyboard
+          (with pkgs; [
+            wvkbd
+          ])
+        else []
+      );
   });
   perSystem = {pkgs, ...}: {
     packages.quickshell = inputs.wrappers.wrappers.quickshell.wrap {