diff --git a/addon/components/paper-dialog-inner.js b/addon/components/paper-dialog-inner.js
index 372a0b31b..68730fe2f 100644
--- a/addon/components/paper-dialog-inner.js
+++ b/addon/components/paper-dialog-inner.js
@@ -7,22 +7,18 @@ const { Component, computed } = Ember;
 export default Component.extend(/*Translate3dMixin, TODO */ {
   tagName: 'md-dialog',
   classNames: ['md-default-theme'     , 'md-transition-in'     /* TODO */ ],
-  classNameBindings: ['contentOverflow:md-content-overflow', 'dialogComponent.fullscreen:md-dialog-fullscreen'],
+  classNameBindings: ['contentOverflow:md-content-overflow', 'fullscreen:md-dialog-fullscreen'],
 
-  dialogComponent: computed(function() {
-    return this.nearestOfType(PaperDialog);
-  }),
+  translateFromOrigin: computed.reads('openFrom'),
 
-  translateFromOrigin: computed.reads('dialogComponent.openFrom'),
-
-  translateToParent: computed.reads('dialogComponent.closeTo'),
+  translateToParent: computed.reads('closeTo'),
 
   onTranslateDestroy(origin) {
     origin.focus();
   },
 
   click(ev) {
-    if (this.get('dialogComponent.clickOutsideToClose')) {
+    if (this.get('clickOutsideToClose')) {
       ev.stopPropagation();
       return false;
     }
diff --git a/app/templates/components/paper-dialog.hbs b/app/templates/components/paper-dialog.hbs
index 462f5eb0b..aeb35d888 100644
--- a/app/templates/components/paper-dialog.hbs
+++ b/app/templates/components/paper-dialog.hbs
@@ -7,7 +7,13 @@
     onTap=(action "outsideClicked")
   }}
   {{#paper-dialog-container outsideClicked=(action "outsideClicked")}}
-    {{#paper-dialog-inner parent=parent openFrom=openFrom closeTo=closeTo}}
+    {{#paper-dialog-inner
+      parent=parent
+      openFrom=openFrom
+      closeTo=closeTo
+      fullscreen=fullscreen
+      clickOutsideToClose=clickOutsideToClose
+    }}
       {{yield}}
     {{/paper-dialog-inner}}
   {{/paper-dialog-container}}