diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index bcb096b3..fdec20aa 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -70,6 +70,7 @@ applications/dolphin/** @skotopes
 # GUI Stuff
 
 applications/gui/** @skotopes
+applications/input/** @skotopes
 
 # iButton
 
diff --git a/applications/input/input.c b/applications/input/input.c
index 975eb7a1..ca90ef7a 100644
--- a/applications/input/input.c
+++ b/applications/input/input.c
@@ -7,9 +7,9 @@
 static Input* input = NULL;
 
 void input_press_timer_callback(void* arg) {
-    InputPin* input_pin = arg;
+    InputPinState* input_pin = arg;
     InputEvent event;
-    event.key = input_pin->key;
+    event.key = input_pin->pin->key;
     event.type = InputTypeLong;
     notify_pubsub(&input->event_pubsub, &event);
 }