diff --git a/requirements.txt b/requirements.txt
index f93cdd5..cc860af 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,6 +2,7 @@ altgraph==0.17
 fbs==0.9.0
 future==0.18.2
 hidapi==0.9.0.post3
+keyboard==0.13.5
 macholib==1.14
 pefile==2019.4.18
 PyInstaller==3.4
diff --git a/src/main/python/keyboard.py b/src/main/python/keyboard_comm.py
similarity index 100%
rename from src/main/python/keyboard.py
rename to src/main/python/keyboard_comm.py
diff --git a/src/main/python/linux_keystroke_recorder.py b/src/main/python/linux_keystroke_recorder.py
index caaef57..2a0c3ec 100644
--- a/src/main/python/linux_keystroke_recorder.py
+++ b/src/main/python/linux_keystroke_recorder.py
@@ -1,2 +1,17 @@
+import sys
+
+import keyboard
+
+
+def key_cb(key):
+    print(key)
+
+
 def linux_keystroke_recorder():
+    keyboard.hook(key_cb)
     print("Recording")
+    while True:
+        ch = sys.stdin.read(1)
+        if ch == "q":
+            keyboard.unhook_all()
+            break
diff --git a/src/main/python/test/test_keyboard.py b/src/main/python/test/test_keyboard.py
index c894648..f031604 100644
--- a/src/main/python/test/test_keyboard.py
+++ b/src/main/python/test/test_keyboard.py
@@ -3,7 +3,7 @@ import lzma
 import struct
 
 
-from keyboard import Keyboard
+from keyboard_comm import Keyboard
 from util import chunks
 
 LAYOUT_2x2 = """
diff --git a/src/main/python/vial_device.py b/src/main/python/vial_device.py
index 21817e0..2412b36 100644
--- a/src/main/python/vial_device.py
+++ b/src/main/python/vial_device.py
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 from hidproxy import hid
-from keyboard import Keyboard
+from keyboard_comm import Keyboard
 
 
 class VialDevice: