diff --git a/anki/find.py b/anki/find.py
index 852a98230..b86319840 100644
--- a/anki/find.py
+++ b/anki/find.py
@@ -246,10 +246,10 @@ select distinct(n.id) from cards c, notes n where c.nid=n.id and """+preds
         val = val.replace("*", "%")
         if not val.startswith("%"):
             val = "% " + val
-        if not val.endswith("%"):
+        if not val.endswith("%") or val.endswith('\\%'):
             val += " %"
         args.append(val)
-        return "n.tags like ?"
+        return "n.tags like ? escape '\\'"
 
     def _findCardState(self, args):
         (val, args) = args
diff --git a/tests/test_find.py b/tests/test_find.py
index 8b036b084..ab4915177 100644
--- a/tests/test_find.py
+++ b/tests/test_find.py
@@ -25,14 +25,14 @@ def test_findCards():
     f = deck.newNote()
     f['Front'] = 'dog'
     f['Back'] = 'cat'
-    f.tags.append("monkey")
+    f.tags.append("monkey animal_1 * %")
     f1id = f.id
     deck.addNote(f)
     firstCardId = f.cards()[0].id
     f = deck.newNote()
     f['Front'] = 'goats are fun'
     f['Back'] = 'sheep'
-    f.tags.append("sheep goat horse")
+    f.tags.append("sheep goat horse animal11")
     deck.addNote(f)
     f2id = f.id
     f = deck.newNote()
@@ -52,6 +52,12 @@ def test_findCards():
     deck.addNote(f)
     latestCardIds = [c.id for c in f.cards()]
     # tag searches
+    assert len(deck.findCards("tag:*")) == 5
+    assert len(deck.findCards("tag:\\*")) == 1
+    assert len(deck.findCards("tag:%")) == 5
+    assert len(deck.findCards("tag:\\%")) == 1
+    assert len(deck.findCards("tag:animal_1")) == 2
+    assert len(deck.findCards("tag:animal\\_1")) == 1
     assert not deck.findCards("tag:donkey")
     assert len(deck.findCards("tag:sheep")) == 1
     assert len(deck.findCards("tag:sheep tag:goat")) == 1