diff --git a/ext/bg/js/options.js b/ext/bg/js/options.js
index dee7e379..3b10b74f 100644
--- a/ext/bg/js/options.js
+++ b/ext/bg/js/options.js
@@ -44,7 +44,7 @@ function formRead() {
         optionsNew.anki.sentenceExt = parseInt($('#sentence-detection-extent').val(), 10);
         optionsNew.anki.server = $('#interface-server').val();
 
-        if (optionsOld.anki.enable) {
+        if (optionsOld.anki.enable && !$('#anki-error').is(':visible')) {
             optionsNew.anki.terms.deck = $('#anki-terms-deck').val();
             optionsNew.anki.terms.model = $('#anki-terms-model').val();
             optionsNew.anki.terms.fields = ankiFieldsToDict($('#terms .anki-field-value'));
diff --git a/ext/bg/search.html b/ext/bg/search.html
index f158306d..adeb9373 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -18,7 +18,7 @@
 
             <p>
                 <form class="input-group">
-                    <input type="text" class="form-control" placeholder="Search for..." id="query">
+                    <input type="text" class="form-control" placeholder="Search for..." id="query" autofocus>
                     <span class="input-group-btn">
                         <input type="submit" class="btn btn-default form-control" id="search" value="Search">
                     </span>
diff --git a/ext/manifest.json b/ext/manifest.json
index 25c13321..bdb1084a 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -1,7 +1,7 @@
 {
     "manifest_version": 2,
     "name": "Yomichan",
-    "version": "1.1.0",
+    "version": "1.1.1",
 
     "description": "Japanese dictionary with Anki integration",
     "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},