diff --git a/evil-core.el b/evil-core.el
index 06001047..d0e1084b 100644
--- a/evil-core.el
+++ b/evil-core.el
@@ -928,6 +928,8 @@ If STATE is nil, it means any state."
       map)
      ((eq entry state)
       map)
+     ((and (listp entry) (member state entry))
+      map)
      ((eq entry 'all)
       map))))
 
@@ -945,6 +947,8 @@ If STATE is nil, it means any state."
       map)
      ((eq entry state)
       map)
+     ((and (listp entry) (member state entry))
+      map)
      ((eq entry 'all)
       map))))