diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15cc205b..8f129930 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Featherlight – Changelog
 Master
 -----------------------------------
 - Changed close icon to a <button>. Be sure to use current CSS files too. [#260]
+- Improved focus handling [#259]
 
 1.5.0 - 2016-06-27
 -----------------------------------
diff --git a/src/featherlight.js b/src/featherlight.js
index 576d1ff8..1d4852b2 100644
--- a/src/featherlight.js
+++ b/src/featherlight.js
@@ -562,6 +562,7 @@
 
 			afterContent: function(_super, event){
 				var r = _super(event);
+				this.$instance.find('[autofocus]:not([disabled])').focus();
 				this.onResize(event);
 				return r;
 			}
diff --git a/test/featherlight_test.js b/test/featherlight_test.js
index eac21ffa..bc004567 100644
--- a/test/featherlight_test.js
+++ b/test/featherlight_test.js
@@ -432,7 +432,13 @@ var stubAjaxLoad = function(content) {
 				$.featherlight.close();
 				expect($(document.activeElement)).to.have.class('for-focus');
 				expect($('.for-focus')).not.to.have.attr('tabindex');
-			})
+			});
+
+			it('focussed on "autofocus" content, if any', function() {
+				$.featherlight({html: '<input><input autofocus class="ok">'});
+				expect($(document.activeElement)).to.have.class('ok');
+				$.featherlight.close();
+			});
 		});
 	});
 }(jQuery));