diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js
index 60f947689..061d7b7ad 100644
--- a/js/ui/screenShield.js
+++ b/js/ui/screenShield.js
@@ -354,7 +354,7 @@ var ScreenShield = class {
 
         this._lockScreenState = MessageTray.State.HIDING;
 
-        this._lockScreenGroup.remove_all_transitions();
+        this._lockDialogGroup.remove_all_transitions();
 
         if (animate) {
             // Tween the lock screen out of screen
@@ -362,16 +362,10 @@ var ScreenShield = class {
             // use the same speed regardless of original position
             // if velocity is specified, it's in pixels per milliseconds
             let h = global.stage.height;
-            let delta = h + this._lockScreenGroup.translation_y;
+            let delta = h + this._lockDialogGroup.translation_y;
             let velocity = global.stage.height / CURTAIN_SLIDE_TIME;
             let duration = delta / velocity;
 
-            this._lockScreenGroup.ease({
-                translation_y: -h,
-                duration,
-                mode: Clutter.AnimationMode.EASE_IN_QUAD,
-            });
-
             this._lockDialogGroup.ease({
                 translation_y: -h,
                 duration,
@@ -433,14 +427,6 @@ var ScreenShield = class {
         let fadeToBlack = params.fadeToBlack;
 
         if (params.animateLockScreen) {
-            this._lockScreenGroup.translation_y = -global.screen_height;
-            this._lockScreenGroup.remove_all_transitions();
-            this._lockScreenGroup.ease({
-                translation_y: 0,
-                duration: MANUAL_FADE_TIME,
-                mode: Clutter.AnimationMode.EASE_OUT_QUAD,
-            });
-
             this._lockDialogGroup.translation_y = -global.screen_height;
             this._lockDialogGroup.remove_all_transitions();
             this._lockDialogGroup.ease({