diff --git a/addon/components/docs-header/search-results/index.hbs b/addon/components/docs-header/search-results/index.hbs
index 49d6306f9..998572f03 100644
--- a/addon/components/docs-header/search-results/index.hbs
+++ b/addon/components/docs-header/search-results/index.hbs
@@ -1,6 +1,10 @@
-<div {{did-insert (perform this.search)}} {{did-update (perform this.search) @query}} ...attributes>
+<div
+  {{did-insert (perform this.search)}}
+  {{did-update (perform this.search) @query}}
+  ...attributes
+>
   {{#if (and this.trimmedQuery this.search.isIdle)}}
-    <ModalDialog
+    <DocsModalDialog
       @tetherTarget="[data-search-box]"
       @attachment="top left"
       @clickOutsideToClose={{true}}
@@ -30,6 +34,6 @@
           </li>
         {{/each}}
       </ul>
-    </ModalDialog>
+    </DocsModalDialog>
   {{/if}}
 </div>
\ No newline at end of file
diff --git a/addon/components/docs-header/version-selector/index.hbs b/addon/components/docs-header/version-selector/index.hbs
index 08086d2c8..9a2b9d3c4 100644
--- a/addon/components/docs-header/version-selector/index.hbs
+++ b/addon/components/docs-header/version-selector/index.hbs
@@ -1,4 +1,4 @@
-<ModalDialog
+<DocsModalDialog
   @tetherTarget="[data-version-selector]"
   @attachment="top right"
   @clickOutsideToClose={{true}}
@@ -69,4 +69,4 @@
       </li>
     {{/each}}
   </ul>
-</ModalDialog>
\ No newline at end of file
+</DocsModalDialog>
\ No newline at end of file
diff --git a/addon/components/docs-keyboard-shortcuts/index.hbs b/addon/components/docs-keyboard-shortcuts/index.hbs
index efe559b26..7efc87b8f 100644
--- a/addon/components/docs-keyboard-shortcuts/index.hbs
+++ b/addon/components/docs-keyboard-shortcuts/index.hbs
@@ -1,5 +1,5 @@
 {{#if this.isShowingKeyboardShortcuts}}
-  <ModalDialog
+  <DocsModalDialog
     @animatable={{true}}
     @overlay={{true}}
     @wrapperClass="docs-fullscreen-modal docs-keyboard-shortcuts-modal modal-fade"
@@ -184,5 +184,5 @@
         </tbody>
       </table>
     </div>
-  </ModalDialog>
+  </DocsModalDialog>
 {{/if}}
\ No newline at end of file
diff --git a/addon/components/modal-dialog.js b/addon/components/docs-modal-dialog.js
similarity index 100%
rename from addon/components/modal-dialog.js
rename to addon/components/docs-modal-dialog.js
diff --git a/app/components/docs-modal-dialog.js b/app/components/docs-modal-dialog.js
new file mode 100644
index 000000000..4100a0b84
--- /dev/null
+++ b/app/components/docs-modal-dialog.js
@@ -0,0 +1 @@
+export { default } from 'ember-cli-addon-docs/components/docs-modal-dialog';
diff --git a/app/components/modal-dialog.js b/app/components/modal-dialog.js
deleted file mode 100644
index e77f12d5b..000000000
--- a/app/components/modal-dialog.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from 'ember-cli-addon-docs/components/modal-dialog';