diff --git a/mindplot/src/main/javascript/Designer.js b/mindplot/src/main/javascript/Designer.js
index 8b20fa85..947c9ce8 100644
--- a/mindplot/src/main/javascript/Designer.js
+++ b/mindplot/src/main/javascript/Designer.js
@@ -1036,6 +1036,7 @@ mindplot.Designer = new Class(/** @lends Designer */{
             var topic = model.selectedTopic();
             if (topic) {
                 topic.showLinkEditor();
+                this.onObjectFocusEvent();
             }
         },
 
@@ -1045,6 +1046,7 @@ mindplot.Designer = new Class(/** @lends Designer */{
             var topic = model.selectedTopic();
             if (topic) {
                 topic.showNoteEditor();
+                this.onObjectFocusEvent();
             }
         },
 
diff --git a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js
index 62ecc3de..83f37aef 100644
--- a/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js
+++ b/mindplot/src/main/javascript/libraries/bootstrap/BootstrapDialog.js
@@ -15,9 +15,6 @@ var BootstrapDialog = new Class({
         this.options.onEventData.dialog = this;
         this._native = $('<div class="modal fade" tabindex="-1"></div>').append('<div class="modal-dialog"></div>');
         var content = $('<div class="modal-content"></div>');
-        content.on('keydown', function(event) {
-            event.stopPropagation();
-        });
         var header = this._buildHeader(title);
         if (header) {
             content.append(header);
diff --git a/mindplot/src/main/javascript/widget/Menu.js b/mindplot/src/main/javascript/widget/Menu.js
index d513d2e6..313c14a8 100644
--- a/mindplot/src/main/javascript/widget/Menu.js
+++ b/mindplot/src/main/javascript/widget/Menu.js
@@ -353,6 +353,7 @@ mindplot.widget.Menu = new Class({
                         closeButton: true,
                         cancelButton: true
                 });
+                designer.onObjectFocusEvent();
             });
             this._registerTooltip('shareIt', $msg('COLLABORATE'));
 
@@ -365,6 +366,7 @@ mindplot.widget.Menu = new Class({
                         closeButton: true,
                         cancelButton: true
                 });
+                designer.onObjectFocusEvent();
             });
             this._registerTooltip('publishIt', $msg('PUBLISH'));
         }
@@ -377,6 +379,7 @@ mindplot.widget.Menu = new Class({
                     closeButton: true,
                     cancelButton: true
                 });
+                designer.onObjectFocusEvent();
             });
             this._registerTooltip('history', $msg('HISTORY'));
         }
@@ -392,6 +395,7 @@ mindplot.widget.Menu = new Class({
                     closeButton: true,
                     cancelButton: true
                 });
+                designer.onObjectFocusEvent();
                 event.preventDefault();
             });
         }
diff --git a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
index d3fa1a7d..0148b725 100644
--- a/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapShare.jsp
@@ -65,7 +65,7 @@
 
         <p><strong><spring:message code="ADD_PEOPLE"/>:</strong></p>
 
-        <input type="text" id="collabEmails" name="collabEmails" class="form-control" autofocus='autofocus'
+        <input type="text" id="collabEmails" name="collabEmails" class="form-control"
                placeholder="<spring:message code="COLLABORATORS_SEPARATED_BY_COMA"/>"/>
 
         <div class="btn-group" id="roleBtn">