diff --git a/core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars b/core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars
index 787f50c6c1..d9ff5659fc 100644
--- a/core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars
+++ b/core/js/share/sharedialoglinkshareview_popover_menu_pending.handlebars
@@ -1,4 +1,4 @@
-<div class="popovermenu open menu">
+<div class="popovermenu open menu pending">
 	<ul>
 		{{#if isPasswordEnforced}}
 			<li>
diff --git a/core/js/sharedialoglinkshareview.js b/core/js/sharedialoglinkshareview.js
index 5dc7d70672..4f4db0eec7 100644
--- a/core/js/sharedialoglinkshareview.js
+++ b/core/js/sharedialoglinkshareview.js
@@ -229,8 +229,8 @@
 			// We need a password before the share creation
 			if (isPasswordEnforced && !this.showPending && this.password === '') {
 				this.showPending = shareId;
-				this.render();
-				$li.find('#enforcedPassText').focus();
+				var self = this.render();
+				self.$el.find('.pending #enforcedPassText').focus();
 			} else {
 				// else, we have a password or it is not enforced
 				$.when(this.model.saveLinkShare(shareData, {
diff --git a/core/js/sharetemplates.js b/core/js/sharetemplates.js
index 619215d808..eb3489f6b4 100644
--- a/core/js/sharetemplates.js
+++ b/core/js/sharetemplates.js
@@ -271,7 +271,7 @@ templates['sharedialoglinkshareview_popover_menu_pending'] = template({"1":funct
 },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "<div class=\"popovermenu open menu\">\n	<ul>\n"
+  return "<div class=\"popovermenu open menu pending\">\n	<ul>\n"
     + ((stack1 = helpers["if"].call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? depth0.isPasswordEnforced : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "	</ul>\n</div>\n";
 },"useData":true});