diff --git a/.meteor/packages b/.meteor/packages
index 34d9ae88a..555a6c4b9 100644
--- a/.meteor/packages
+++ b/.meteor/packages
@@ -42,7 +42,6 @@ session@1.2.1
 tracker@1.3.3
 underscore@1.0.13
 audit-argument-checks@1.0.7
-mquandalle:autofocus
 raix:handlebar-helpers
 http@2.0.0! # force new http package
 
diff --git a/.meteor/versions b/.meteor/versions
index 775365caf..65b8f3ead 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -78,7 +78,6 @@ mongo-decimal@0.1.3
 mongo-dev-server@1.1.0
 mongo-id@1.0.8
 mongo-livedata@1.0.12
-mquandalle:autofocus@1.0.0
 mquandalle:jade@0.4.9
 mquandalle:jade-compiler@0.4.5
 msavin:usercache@1.8.0
diff --git a/client/lib/autofocus.js b/client/lib/autofocus.js
new file mode 100644
index 000000000..2c6dab034
--- /dev/null
+++ b/client/lib/autofocus.js
@@ -0,0 +1,13 @@
+// Native replacement for mquandalle:autofocus package
+// Handles autofocus attribute in dynamically rendered Blaze templates
+import { Template } from 'meteor/templating';
+import { Tracker } from 'meteor/tracker';
+
+Template.onRendered(function() {
+  Tracker.afterFlush(() => {
+    const el = this.find('[autofocus]');
+    if (el && typeof el.focus === 'function') {
+      el.focus();
+    }
+  });
+});