diff --git a/app/src/main/java/emu/skyline/input/onscreen/OnScreenEditActivity.kt b/app/src/main/java/emu/skyline/input/onscreen/OnScreenEditActivity.kt
index 1fdbcdea..81929b24 100644
--- a/app/src/main/java/emu/skyline/input/onscreen/OnScreenEditActivity.kt
+++ b/app/src/main/java/emu/skyline/input/onscreen/OnScreenEditActivity.kt
@@ -76,7 +76,7 @@ class OnScreenEditActivity : AppCompatActivity() {
             .show()
     }
 
-    @SuppressLint("ClickableViewAccessibility")
+    @SuppressLint("ClickableViewAccessibility", "SetTextI18n")
     override fun onCreate(savedInstanceState : Bundle?) {
         super.onCreate(savedInstanceState)
         window.attributes.layoutInDisplayCutoutMode = WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
@@ -137,6 +137,15 @@ class OnScreenEditActivity : AppCompatActivity() {
         binding.dragHandle.setOnTouchListener(dragPanelListener)
         binding.closeButton.setOnClickListener { togglePanelVisibility() }
 
+        binding.onScreenControllerView.setOnButtonStateChangedListener { buttonId, state ->
+            binding.lastInputEvent.text = "Timestamp: ${System.currentTimeMillis()}\nButton: ${buttonId.short}\n$state"
+        }
+        binding.onScreenControllerView.setOnStickStateChangedListener { stickId, position ->
+            val x = "%9.6f".format(position.x)
+            val y = "%9.6f".format(position.y)
+            binding.lastInputEvent.text = "Timestamp: ${System.currentTimeMillis()}\nStick: ${stickId.button.short}\nX: $x\nY: $y"
+        }
+
         binding.onScreenControllerView.setEditMode(true)
     }
 
@@ -205,6 +214,7 @@ class OnScreenEditActivity : AppCompatActivity() {
 
     private fun togglePanelVisibility() {
         isPanelVisible = !isPanelVisible
+        binding.lastInputEvent.text = null
         binding.content.isGone = !isPanelVisible
         binding.dragHandle.isGone = !isPanelVisible
 
diff --git a/app/src/main/res/layout/on_screen_edit_activity.xml b/app/src/main/res/layout/on_screen_edit_activity.xml
index 9b30b942..94e9f90e 100644
--- a/app/src/main/res/layout/on_screen_edit_activity.xml
+++ b/app/src/main/res/layout/on_screen_edit_activity.xml
@@ -17,6 +17,16 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
+    <TextView
+        android:id="@+id/last_input_event"
+        style="?attr/textAppearanceTitleMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:textAlignment="center"
+        android:textColor="#E6E1E5"
+        tools:text="Timestamp: 16000000000\nButton: A\nReleased" />
+
     <LinearLayout
         android:id="@+id/control_panel"
         android:layout_width="wrap_content"