diff --git a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/PulseViewHook.java b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/PulseViewHook.java
index 1d6b95258..a8ebf1606 100644
--- a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/PulseViewHook.java
+++ b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/PulseViewHook.java
@@ -244,10 +244,8 @@ protected void afterHookedMethod(MethodHookParam param) throws Throwable {
                 if (PulseControllerImpl.hasInstance()) {
                     //log(TAG + "Keyguard is showing: " + param.args[0]);
                     PulseControllerImpl.getInstance().setKeyguardShowing((boolean) param.args[0]);
-                    if (VisualizerView.getInstance() != null && DWallpaperEnabled) {
-                        VisualizerView.getInstance().bringToFront();
-                        VisualizerView.getInstance().requestLayout();
-                    }
+                    VisualizerView.getInstance().bringToFront();
+                    VisualizerView.getInstance().requestLayout();
                     updateLockscreenIcons();
                 }
             }
@@ -279,6 +277,7 @@ private void updateLockscreenIcons() {
             mEndButton.bringToFront();
             mEndButton.requestLayout();
         }
+        mKeyguardBottomArea.bringToFront();
         mKeyguardBottomArea.requestLayout();
     }
     private void onPrimaryMetadataOrStateChanged(int state) {
diff --git a/app/src/main/java/it/dhd/oxygencustomizer/xposed/views/pulse/PulseControllerImpl.java b/app/src/main/java/it/dhd/oxygencustomizer/xposed/views/pulse/PulseControllerImpl.java
index bd0e52c39..a247d1756 100644
--- a/app/src/main/java/it/dhd/oxygencustomizer/xposed/views/pulse/PulseControllerImpl.java
+++ b/app/src/main/java/it/dhd/oxygencustomizer/xposed/views/pulse/PulseControllerImpl.java
@@ -182,26 +182,6 @@ private void updatePulseVisibility() {
         boolean allowNavPulse = vv != null && vv.isAttached()
                 && mNavPulseEnabled && !mKeyguardShowing && !mDozing;
 
-        /*if (mKeyguardGoingAway) {
-            detachPulseFrom(vv, allowNavPulse /*keep linked*//*);
-        } else if (allowNavPulse) {
-            detachPulseFrom(vv, allowNavPulse /*keep linked*//*);
-            attachPulseTo(mNavBar);
-        } else if (allowLsPulse) {
-            detachPulseFrom(mNavBar, allowLsPulse /*keep linked*//*);
-            if (mAmbPulseEnabled) detachPulseFrom(mAodRootLayout, allowLsPulse /*keep linked*//*);
-            attachPulseTo(vv);
-        } else if (allowAmbPulse) {
-            detachPulseFrom(mNavBar, allowAmbPulse /*keep linked*//*);
-            if (mLsPulseEnabled) detachPulseFrom(vv, allowAmbPulse /*keep linked*//*);
-            attachPulseTo(mAodRootLayout);
-        } else {
-            detachPulseFrom(mNavBar, false /*keep linked*//*);
-            detachPulseFrom(mAodRootLayout, false /*keep linked*//*);
-            detachPulseFrom(mKeyguardLayout, false /*keep linked*//*);
-            detachPulseFrom(vv, false /*keep linked*//*);
-        }*/
-
         if (mKeyguardGoingAway) {
             detachPulseFrom(vv, allowNavPulse /*keep linked*/);
         } else if (allowNavPulse) {
@@ -218,7 +198,6 @@ private void updatePulseVisibility() {
         } else {
             detachPulseFrom(mNavBar, false /*keep linked*/);
             detachPulseFrom(mAodRootLayout, false /*keep linked*/);
-            //detachPulseFrom(mKeyguardLayout, false /*keep linked*/);
             detachPulseFrom(vv, false /*keep linked*/);
         }
     }