diff --git a/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java b/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java
index e8ec24587..4af8ca62d 100644
--- a/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java
+++ b/twidere/src/main/java/org/mariotaku/twidere/util/KeyboardShortcutsHandler.java
@@ -307,11 +307,12 @@ public class KeyboardShortcutsHandler implements KeyboardShortcutConstants {
     public static final class KeyboardShortcutSpec {
 
         private String action;
+        @Nullable
         private String contextTag;
         private int keyMeta;
         private String keyName;
 
-        public KeyboardShortcutSpec(String contextTag, int keyMeta, String keyName, String action) {
+        public KeyboardShortcutSpec(@Nullable String contextTag, int keyMeta, String keyName, String action) {
             this.contextTag = contextTag;
             this.keyMeta = keyMeta;
             this.keyName = keyName;
@@ -340,11 +341,12 @@ public class KeyboardShortcutsHandler implements KeyboardShortcutConstants {
             return action;
         }
 
+        @Nullable
         public String getContextTag() {
             return contextTag;
         }
 
-        public void setContextTag(String contextTag) {
+        public void setContextTag(@Nullable String contextTag) {
             this.contextTag = contextTag;
         }
 
diff --git a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt
index 42935a62d..34cbe5669 100644
--- a/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt
+++ b/twidere/src/main/kotlin/org/mariotaku/twidere/preference/KeyboardShortcutPreference.kt
@@ -31,7 +31,7 @@ class KeyboardShortcutPreference(context: Context, attrs: AttributeSet? = null)
 
     private val preferencesChangeListener: SharedPreferences.OnSharedPreferenceChangeListener
 
-    val contextTag: String
+    val contextTag: String?
     val action: String
 
     @Inject
@@ -42,7 +42,6 @@ class KeyboardShortcutPreference(context: Context, attrs: AttributeSet? = null)
         val a = context.obtainStyledAttributes(attrs, R.styleable.KeyboardShortcutPreference)
         contextTag = a.getString(R.styleable.KeyboardShortcutPreference_android_tag)
         action = a.getString(R.styleable.KeyboardShortcutPreference_android_action)
-                .takeUnless(String::isNullOrEmpty) ?: throw IllegalArgumentException("android:action required")
         a.recycle()
 
         key = action