diff --git a/chrome/content/zotero/xpcom/annotate.js b/chrome/content/zotero/xpcom/annotate.js
index 031b73f7d1..b4f803a586 100644
--- a/chrome/content/zotero/xpcom/annotate.js
+++ b/chrome/content/zotero/xpcom/annotate.js
@@ -509,8 +509,8 @@ Zotero.Annotation.prototype.initWithEvent = function(e) {
 	
 	Zotero.debug("Annotate: added new annotation");
 	
-
 	this.displayWithAbsoluteCoordinates(clickX, clickY);
+	this.textarea.select();
 }
 
 Zotero.Annotation.prototype.initWithDBRow = function(row) {
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index d42f9ed0db..842db2ae24 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -34,4 +34,6 @@ pref("extensions.zotero.keys.toggleTagSelector", 'T');
 pref("extensions.zotero.export.lastTranslator", '14763d24-8ba0-45df-8f52-b8d1108e7ac9');
 pref("extensions.zotero.export.translatorSettings", 'true,false');
 pref("extensions.zotero.export.lastStyle", 'http://purl.org/net/xbiblio/csl/styles/apa.csl');
-pref("extensions.zotero.export.bibliographySettings", 'save-as-rtf');
\ No newline at end of file
+pref("extensions.zotero.export.bibliographySettings", 'save-as-rtf');
+
+pref("extensions.zotero.annotations.warnOnClose", true);
\ No newline at end of file