diff --git a/submodules/LegacyComponents/Sources/TGPhotoEntitiesContainerView.m b/submodules/LegacyComponents/Sources/TGPhotoEntitiesContainerView.m
index 5dda688790..b0c3d3d654 100644
--- a/submodules/LegacyComponents/Sources/TGPhotoEntitiesContainerView.m
+++ b/submodules/LegacyComponents/Sources/TGPhotoEntitiesContainerView.m
@@ -174,7 +174,8 @@
 - (void)setupWithPaintingData:(TGPaintingData *)paintingData {
     [self removeAll];
     for (TGPhotoPaintEntity *entity in paintingData.entities) {
-        [self createEntityViewWithEntity:entity];
+        UIView * entityView = [self createEntityViewWithEntity:entity];
+        [self addSubview:entityView];
     }
 }
 
diff --git a/submodules/PremiumUI/Sources/PhoneDemoComponent.swift b/submodules/PremiumUI/Sources/PhoneDemoComponent.swift
index a55181c69a..a26da3191d 100644
--- a/submodules/PremiumUI/Sources/PhoneDemoComponent.swift
+++ b/submodules/PremiumUI/Sources/PhoneDemoComponent.swift
@@ -132,8 +132,8 @@ private final class PhoneView: UIView {
         self.addSubview(self.borderView)
         self.addSubview(self.frontShimmerView)
         
-        self.backShimmerView.addSubview(self.backShimmerEffectView)
         self.backShimmerView.addSubview(self.backShimmerFadeView)
+        self.backShimmerView.addSubview(self.backShimmerEffectView)
         
         self.shimmerMaskView.addSubview(self.shimmerBorderView)
         self.shimmerMaskView.addSubview(self.shimmerStarView)