diff --git a/paper-drawer-panel.html b/paper-drawer-panel.html
index d95f8fb..35bffd2 100644
--- a/paper-drawer-panel.html
+++ b/paper-drawer-panel.html
@@ -155,7 +155,7 @@
         @apply(--paper-drawer-panel-drawer-container);
       }
 
-      .transition-drawer {
+      .transition > .transition-drawer {
         transition: -webkit-transform ease-in-out 0.3s, width ease-in-out 0.3s, visibility 0.3s;
         transition: transform ease-in-out 0.3s, width ease-in-out 0.3s, visibility 0.3s;
       }
@@ -571,6 +571,7 @@
          */
         openDrawer: function() {
           requestAnimationFrame(function() {
+            this._moveDrawer(null);
             this.toggleClass("transition-drawer", true, this.$.drawer);
             this.selected = 'drawer';
           }.bind(this));
@@ -584,6 +585,7 @@
          */
         closeDrawer: function() {
           requestAnimationFrame(function() {
+            this._moveDrawer(null);
             this.toggleClass("transition-drawer", true, this.$.drawer);
             this.selected = 'main';
           }.bind(this));
@@ -689,6 +691,7 @@
 
         _startEdgePeek: function() {
           this.width = this.$.drawer.offsetWidth;
+          this.toggleClass("transition-drawer", true, this.$.drawer);
           this._moveDrawer(this._translateXForDeltaX(this.rightDrawer ?
               -this.edgeSwipeSensitivity : this.edgeSwipeSensitivity));
           this._setPeeking(true);
@@ -697,6 +700,7 @@
         _stopEdgePeek: function() {
           if (this.peeking) {
             this._setPeeking(false);
+            this.toggleClass("transition-drawer", true, this.$.drawer);
             this._moveDrawer(null);
           }
         },
@@ -786,7 +790,6 @@
             this._setDragging(false);
             this._transition = true;
             sharedPanel = null;
-            this._moveDrawer(null);
 
             if (this.rightDrawer) {
               this[xDirection ? 'closeDrawer' : 'openDrawer']();