diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/DisplayActivity.kt b/android/TerminalApp/java/com/android/virtualization/terminal/DisplayActivity.kt
index 03206e5..290cf5a 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/DisplayActivity.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/DisplayActivity.kt
@@ -16,6 +16,7 @@
 package com.android.virtualization.terminal
 
 import android.os.Bundle
+import android.system.virtualmachine.VirtualMachineManager
 import android.view.SurfaceView
 import android.view.WindowInsets
 import android.view.WindowInsetsController
@@ -31,6 +32,20 @@
         makeFullscreen()
         // Connect the views to the VM
         displayProvider = DisplayProvider(mainView, cursorView)
+        val vmm =
+            applicationContext.getSystemService<VirtualMachineManager>(
+                VirtualMachineManager::class.java
+            )
+        val debianVm = vmm.get("debian")
+        if (debianVm != null) {
+            InputForwarder(
+                this,
+                debianVm,
+                findViewById(R.id.background_touch_view),
+                findViewById(R.id.surface_view),
+                findViewById(R.id.surface_view),
+            )
+        }
     }
 
     override fun onPause() {
diff --git a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
index 52c8271..346056a 100644
--- a/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
+++ b/android/TerminalApp/java/com/android/virtualization/terminal/VmLauncherService.kt
@@ -220,12 +220,16 @@
 
         // TODO(jeongik): let it configurable
         if (terminalGuiSupport()) {
-            builder.setDisplayConfig(
-                VirtualMachineCustomImageConfig.DisplayConfig.Builder()
-                    .setWidth(1920)
-                    .setHeight(1080)
-                    .build()
-            )
+            builder
+                .setDisplayConfig(
+                    VirtualMachineCustomImageConfig.DisplayConfig.Builder()
+                        .setWidth(1920)
+                        .setHeight(1080)
+                        .build()
+                )
+                .useKeyboard(true)
+                .useMouse(true)
+                .useTouch(true)
             changed = true
         }
 
