diff --git a/src/ui/remote.rs b/src/ui/remote.rs
index e732bcbb3..34888aba9 100644
--- a/src/ui/remote.rs
+++ b/src/ui/remote.rs
@@ -315,13 +315,7 @@ impl Handler {
                     key_event.set_control_key(k);
                 } else {
                     let chr = match evt.name {
-                        Some(ref s) => {
-                            if s.len() == 1 {
-                                s.chars().next().unwrap()
-                            } else {
-                                '\0'
-                            }
-                        }
+                        Some(ref s) => s.chars().next().unwrap_or('\0'),
                         _ => '\0',
                     };
                     if chr != '\0' {