diff --git a/chrome/content/zotero/bindings/attachmentbox.xml b/chrome/content/zotero/bindings/attachmentbox.xml
index 4e881c0494..5eb42f95d3 100644
--- a/chrome/content/zotero/bindings/attachmentbox.xml
+++ b/chrome/content/zotero/bindings/attachmentbox.xml
@@ -508,7 +508,7 @@
 				
 				<hbox id="index-box">
 					<label id="index-status"/>
-					<toolbarbutton id="reindex" oncommand="ZoteroPane.reindexItem()"/>
+					<toolbarbutton id="reindex" oncommand="this.hidden = true; setTimeout(function () { ZoteroPane.reindexItem(); }, 50)"/>
 				</hbox>
 				
 				<zoteronoteeditor id="note-editor" notitle="1" flex="1"/>
diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js
index a01a8b62d3..fd88aa6227 100644
--- a/chrome/content/zotero/xpcom/fulltext.js
+++ b/chrome/content/zotero/xpcom/fulltext.js
@@ -830,6 +830,9 @@ Zotero.Fulltext = new function(){
 				case this.INDEX_STATE_UNAVAILABLE:
 				case this.INDEX_STATE_UNINDEXED:
 				case this.INDEX_STATE_PARTIAL:
+				
+				// TODO: automatically reindex already-indexed attachments?
+				case this.INDEX_STATE_INDEXED:
 					return true;
 			}
 		}