diff --git a/action_plugins/remap/__init__.py b/action_plugins/remap/__init__.py
index 64e797c5..1e44d9d1 100644
--- a/action_plugins/remap/__init__.py
+++ b/action_plugins/remap/__init__.py
@@ -123,6 +123,12 @@ def _populate_ui(self):
         if self.action_data.parent.tag == "hat_buttons":
             input_type = InputType.JoystickButton
 
+        # Handle obscure bug which causes the action_data to contain no
+        # input_type information
+        if input_type is None:
+            input_type = InputType.JoystickButton
+            logging.getLogger("system").warning("None as input type encountered")
+
         # If no valid input item is selected get the next unused one
         if self.action_data.vjoy_input_id in [0, None]:
             free_inputs = self._get_profile_root().list_unused_vjoy_inputs()