diff --git a/packages/frontend/app/components/instructor-groups/new.hbs b/packages/frontend/app/components/instructor-groups/new.hbs
index 680001edba..326c0e3d37 100644
--- a/packages/frontend/app/components/instructor-groups/new.hbs
+++ b/packages/frontend/app/components/instructor-groups/new.hbs
@@ -10,7 +10,7 @@
         </label>
         <input
           id="title-{{templateId}}"
-          {{autofocus}}
+          {{focus}}
           type="text"
           disabled={{this.save.isRunning}}
           placeholder={{t "general.instructorGroupTitlePlaceholder"}}
@@ -19,31 +19,21 @@
           {{on "keyup" this.keyboard}}
           {{on "keyup" (fn this.addErrorDisplayFor "title")}}
           {{on "input" (pick "target.value" (set this.title))}}
-        >
+        />
         <ValidationError @errors={{get-errors-for this.title}} />
       </div>
       <div class="buttons">
-        <button
-          type="button"
-          class="done text"
-          {{on "click" (perform this.save)}}
-          data-test-done
-        >
+        <button type="button" class="done text" {{on "click" (perform this.save)}} data-test-done>
           {{#if this.save.isRunning}}
             <LoadingSpinner />
           {{else}}
             {{t "general.done"}}
           {{/if}}
         </button>
-        <button
-          type="button"
-          class="cancel text"
-          {{on "click" @cancel}}
-          data-test-cancel
-        >
+        <button type="button" class="cancel text" {{on "click" @cancel}} data-test-cancel>
           {{t "general.cancel"}}
         </button>
       </div>
     </div>
   </div>
-{{/let}}
+{{/let}}
\ No newline at end of file
diff --git a/packages/ilios-common/addon/modifiers/autofocus.js b/packages/ilios-common/addon/modifiers/autofocus.js
deleted file mode 100644
index 74cb1bd392..0000000000
--- a/packages/ilios-common/addon/modifiers/autofocus.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { modifier } from 'ember-modifier';
-
-export default modifier((element) => element.focus(), { eager: false });
diff --git a/packages/ilios-common/app/modifiers/autofocus.js b/packages/ilios-common/app/modifiers/autofocus.js
deleted file mode 100644
index d65ed34bf8..0000000000
--- a/packages/ilios-common/app/modifiers/autofocus.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ilios-common/modifiers/autofocus';
diff --git a/packages/test-app/tests/integration/modifiers/autofocus-test.js b/packages/test-app/tests/integration/modifiers/autofocus-test.js
deleted file mode 100644
index 3ebc9ac0d4..0000000000
--- a/packages/test-app/tests/integration/modifiers/autofocus-test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { module, test } from 'qunit';
-import { setupRenderingTest } from 'test-app/tests/helpers';
-import { render } from '@ember/test-helpers';
-import { hbs } from 'ember-cli-htmlbars';
-
-module('Integration | Modifier | autofocus', function (hooks) {
-  setupRenderingTest(hooks);
-
-  test('it focuses', async function (assert) {
-    this.set('label', 'foo bar');
-    await render(hbs`<label><input {{autofocus}} />{{this.label}}</label>
-`);
-
-    assert.dom('input').isFocused();
-  });
-});