diff --git a/src/components/middle/composer/CustomEmojiTooltip.module.scss b/src/components/middle/composer/CustomEmojiTooltip.module.scss
index 85213c3d6..84cd076b1 100644
--- a/src/components/middle/composer/CustomEmojiTooltip.module.scss
+++ b/src/components/middle/composer/CustomEmojiTooltip.module.scss
@@ -14,7 +14,7 @@
     margin: 0.5rem 0 0.5rem 0.25rem;
   }
 
-  &:global(.shown + .StickerTooltip) {
-    transform: translateY(-1.75rem);
+  &:global(.open + .StickerTooltip) {
+    transform: translateY(-3.25rem);
   }
 }
diff --git a/src/components/middle/composer/CustomEmojiTooltip.tsx b/src/components/middle/composer/CustomEmojiTooltip.tsx
index c5bf60224..f667463c2 100644
--- a/src/components/middle/composer/CustomEmojiTooltip.tsx
+++ b/src/components/middle/composer/CustomEmojiTooltip.tsx
@@ -74,7 +74,7 @@ const CustomEmojiTooltip: FC<OwnProps & StateProps> = ({
 
   const className = buildClassName(
     styles.root,
-    'composer-tooltip custom-scroll-x',
+    'composer-tooltip no-scrollbar',
     transitionClassNames,
     !displayedStickers?.length && styles.hidden,
   );
diff --git a/src/components/middle/composer/EmojiTooltip.tsx b/src/components/middle/composer/EmojiTooltip.tsx
index dbf38ea12..90bf4666a 100644
--- a/src/components/middle/composer/EmojiTooltip.tsx
+++ b/src/components/middle/composer/EmojiTooltip.tsx
@@ -80,7 +80,7 @@ const EmojiTooltip: FC<OwnProps> = ({
   const containerRef = useRef<HTMLDivElement>();
   const { shouldRender, transitionClassNames } = useShowTransitionDeprecated(isOpen, undefined, undefined, false);
   const listEmojis: (Emoji | ApiSticker)[] = usePrevDuringAnimation(
-    emojis.length ? [...customEmojis, ...emojis] : undefined, CLOSE_DURATION,
+    emojis.length ? [...emojis, ...customEmojis] : undefined, CLOSE_DURATION,
   ) || [];
 
   useHorizontalScroll(containerRef);
@@ -135,7 +135,7 @@ const EmojiTooltip: FC<OwnProps> = ({
   }, [selectedIndex]);
 
   const className = buildClassName(
-    'EmojiTooltip composer-tooltip custom-scroll-x',
+    'EmojiTooltip composer-tooltip no-scrollbar',
     transitionClassNames,
   );