diff --git a/radio/src/thirdparty/libopenui/CMakeLists.txt b/radio/src/thirdparty/libopenui/CMakeLists.txt
deleted file mode 100644
index 5f0cf266a..000000000
--- a/radio/src/thirdparty/libopenui/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-include(src)
diff --git a/radio/src/thirdparty/libopenui/src/CMakeLists.txt b/radio/src/thirdparty/libopenui/src/CMakeLists.txt
index 1227244e7..e6c7c273f 100644
--- a/radio/src/thirdparty/libopenui/src/CMakeLists.txt
+++ b/radio/src/thirdparty/libopenui/src/CMakeLists.txt
@@ -1,3 +1,15 @@
+if(HARDWARE_KEYS)
+  add_definitions(-DHARDWARE_KEYS)
+endif()
+
+if(HARWARE_TOUCH)
+  add_definitions(-DHARDWARE_TOUCH)
+endif()
+
+if(SOFTWARE_KEYBOARD)
+  add_definitions(-DSOFTWARE_KEYBOARD)
+endif()
+
 set(LIBOPENUI_SRC
   libopenui_globals.cpp
   libopenui_file.cpp
@@ -21,7 +33,7 @@ set(LIBOPENUI_SRC
   message_dialog.cpp
   )
 
-if(HARDWARE_TOUCH)
+if(SOFTWARE_KEYBOARD)
   set(LIBOPENUI_SRC
     ${LIBOPENUI_SRC}
     keyboard_text.cpp
diff --git a/radio/src/thirdparty/libopenui/src/numberedit.cpp b/radio/src/thirdparty/libopenui/src/numberedit.cpp
index 33b6e4fa9..4e2dd4d96 100644
--- a/radio/src/thirdparty/libopenui/src/numberedit.cpp
+++ b/radio/src/thirdparty/libopenui/src/numberedit.cpp
@@ -19,7 +19,7 @@
 
 #include "numberedit.h"
 
-#if defined(HARDWARE_TOUCH)
+#if defined(SOFTWARE_KEYBOARD)
 #include "keyboard_number.h"
 #endif
 
@@ -119,7 +119,7 @@ void NumberEdit::onEvent(event_t event)
   FormField::onEvent(event);
 }
 
-#if defined(HARDWARE_TOUCH)
+#if defined(SOFTWARE_KEYBOARD)
 bool NumberEdit::onTouchEnd(coord_t, coord_t)
 {
   if (!enabled) {
@@ -138,8 +138,9 @@ bool NumberEdit::onTouchEnd(coord_t, coord_t)
 
 void NumberEdit::onFocusLost()
 {
-#if defined(HARDWARE_TOUCH)
+#if defined(SOFTWARE_KEYBOARD)
   Keyboard::hide();
 #endif
+
   FormField::onFocusLost();
 }
diff --git a/radio/src/thirdparty/libopenui/src/numberedit.h b/radio/src/thirdparty/libopenui/src/numberedit.h
index 7bf689344..793df432e 100644
--- a/radio/src/thirdparty/libopenui/src/numberedit.h
+++ b/radio/src/thirdparty/libopenui/src/numberedit.h
@@ -69,7 +69,7 @@ class NumberEdit : public BaseNumberEdit {
 
     void onEvent(event_t event) override;
 
-#if defined(HARDWARE_TOUCH)
+#if defined(SOFTWARE_KEYBOARD)
     bool onTouchEnd(coord_t x, coord_t y) override;
 #endif
 
diff --git a/radio/src/thirdparty/libopenui/src/textedit.h b/radio/src/thirdparty/libopenui/src/textedit.h
index e160dd865..8f7d3f05f 100644
--- a/radio/src/thirdparty/libopenui/src/textedit.h
+++ b/radio/src/thirdparty/libopenui/src/textedit.h
@@ -56,7 +56,9 @@ class TextEdit : public FormField {
 
 #if defined(HARDWARE_TOUCH)
     bool onTouchEnd(coord_t x, coord_t y) override;
+#endif
 
+#if defined(SOFTWARE_KEYBOARD)
     void onFocusLost() override;
 #endif