diff --git a/src/components/main/Header/style.scss b/src/components/main/Header/style.scss
index f3108962..45e99be5 100644
--- a/src/components/main/Header/style.scss
+++ b/src/components/main/Header/style.scss
@@ -1,6 +1,6 @@
 .wrap {
   height: $header_height;
-  z-index: 5;
+  z-index: 25;
   position: fixed;
   top: 0;
   left: 0;
diff --git a/src/components/tags/TagAutocomplete/index.tsx b/src/components/tags/TagAutocomplete/index.tsx
index f2948b65..fc69c6ab 100644
--- a/src/components/tags/TagAutocomplete/index.tsx
+++ b/src/components/tags/TagAutocomplete/index.tsx
@@ -6,6 +6,7 @@ import * as TAG_ACTIONS from '~/redux/tag/actions';
 import { selectTagAutocomplete } from '~/redux/tag/selectors';
 import { separateTagOptions } from '~/utils/tag';
 import { TagAutocompleteRow } from '~/components/tags/TagAutocompleteRow';
+import { usePopper } from 'react-popper';
 
 const mapStateToProps = selectTagAutocomplete;
 const mapDispatchToProps = {
@@ -30,16 +31,28 @@ const TagAutocompleteUnconnected: FC<Props> = ({
   tagLoadAutocomplete,
   options,
 }) => {
-  const [top, setTop] = useState(false);
-  const [left, setLeft] = useState(false);
-
   const [selected, setSelected] = useState(-1);
   const [categories, tags] = useMemo(
     () =>
-      separateTagOptions(options.filter(option => option !== search && !exclude.includes(option))),
+      separateTagOptions(
+        options.slice(0, 7).filter(option => option !== search && !exclude.includes(option))
+      ),
     [options, search, exclude]
   );
   const scroll = useRef<HTMLDivElement>(null);
+  const wrapper = useRef<HTMLDivElement>(null);
+
+  const pop = usePopper(wrapper?.current?.parentElement, wrapper.current, {
+    placement: 'bottom-end',
+    modifiers: [
+      {
+        name: 'offset',
+        options: {
+          offset: [0, 4],
+        },
+      },
+    ],
+  });
 
   const onKeyDown = useCallback(
     event => {
@@ -62,17 +75,6 @@ const TagAutocompleteUnconnected: FC<Props> = ({
     [setSelected, selected, categories, tags, onSelect, search]
   );
 
-  const onScroll = useCallback(() => {
-    if (!scroll.current) return;
-    const { y, height, x, width } = scroll.current.getBoundingClientRect();
-
-    const newTop = window.innerHeight - y - height <= (top ? 120 : 10);
-    if (top !== newTop) setTop(newTop);
-
-    const newLeft = x <= 0;
-    if (newLeft !== left) setLeft(newLeft);
-  }, [scroll.current, top, left]);
-
   useEffect(() => {
     input.addEventListener('keydown', onKeyDown, false);
     return () => input.removeEventListener('keydown', onKeyDown);
@@ -99,20 +101,13 @@ const TagAutocompleteUnconnected: FC<Props> = ({
     }
   }, [selected, scroll.current]);
 
-  useEffect(() => {
-    onScroll();
-
-    window.addEventListener('resize', onScroll);
-    window.addEventListener('scroll', onScroll);
-
-    return () => {
-      window.removeEventListener('resize', onScroll);
-      window.removeEventListener('scroll', onScroll);
-    };
-  }, [options, search]);
-
   return (
-    <div className={classNames(styles.window, { [styles.top]: top, [styles.left]: left })}>
+    <div
+      className={classNames(styles.window)}
+      ref={wrapper}
+      style={pop.styles.popper}
+      {...pop.attributes.popper}
+    >
       <div className={styles.scroll} ref={scroll}>
         <TagAutocompleteRow selected={selected === -1} title={search} type="enter" />
 
diff --git a/src/components/tags/TagAutocomplete/styles.module.scss b/src/components/tags/TagAutocomplete/styles.module.scss
index abdd204f..ec6baaef 100644
--- a/src/components/tags/TagAutocomplete/styles.module.scss
+++ b/src/components/tags/TagAutocomplete/styles.module.scss
@@ -6,7 +6,7 @@
 $row_height: 24px;
 
 .window {
-  box-shadow: transparentize(white, 0.9) 0 0 0 1px, transparentize(black, 0.7) 4px 4px;
+  box-shadow: transparentize(white, 0.9) 0 0 0 1px;
   position: absolute;
   top: -2px;
   right: -2px;
@@ -14,24 +14,12 @@ $row_height: 24px;
   max-width: 300px;
   background: darken($content_bg, 2%);
   z-index: 10;
-  border-radius: 3px;
-  padding: $tag_height + 4px 0 0;
+  border-radius: 4px;
   animation: appear 0.25s forwards;
-
-  &.top {
-    bottom: -2px;
-    top: auto;
-    padding: 0 0 $tag_height + 4px;
-  }
-
-  &.left {
-    right: auto;
-    left: -2px;
-  }
 }
 
 .scroll {
-  overflow: auto;
-  max-height: 7 * $row_height + $tag_height;
+  overflow: hidden;
   padding: 0 0 $gap / 2;
+  border-radius: 4px;
 }
diff --git a/src/containers/sidebars/SidebarWrapper/styles.module.scss b/src/containers/sidebars/SidebarWrapper/styles.module.scss
index a581c1af..dda5cc05 100644
--- a/src/containers/sidebars/SidebarWrapper/styles.module.scss
+++ b/src/containers/sidebars/SidebarWrapper/styles.module.scss
@@ -16,7 +16,7 @@
   background: rgba(255, 0, 0, 0.3);
   display: flex;
   flex-direction: row;
-  z-index: 20;
+  z-index: 26;
   justify-content: flex-end;
   overflow: hidden;
   animation: appear 0.25s forwards;