diff --git a/site/src/layouts/index.vue b/site/src/layouts/index.vue
index fa7f8b71c..e0ad2a81c 100644
--- a/site/src/layouts/index.vue
+++ b/site/src/layouts/index.vue
@@ -1,6 +1,6 @@
 <template>
   <Header />
-  <div v-if="headers.length" class="toc-affix" :style="y > 60 ? 'position:fixed; top: 16px;' : ''">
+  <div v-if="headers.length" class="toc-affix" :style="y > 102 ? 'position:fixed; top: 16px;' : ''">
     <a-anchor style="width: 160px" :items="headers">
       <template #customTitle="item">
         <LinkOutlined v-if="item.target" />
diff --git a/site/src/theme/static/common.less b/site/src/theme/static/common.less
index d0be99440..a40355a17 100644
--- a/site/src/theme/static/common.less
+++ b/site/src/theme/static/common.less
@@ -19,14 +19,14 @@ a {
 
 .main-wrapper {
   position: relative;
-  padding: 40px 0 0;
+  padding: 0;
   background: var(--component-background);
 }
 
 .main-container {
   position: relative;
   min-height: 500px;
-  padding: 0 170px 32px 64px;
+  padding: 40px 170px 32px 64px;
   background: var(--component-background);
 
   .ant-row-rtl & {
diff --git a/site/src/theme/static/toc.less b/site/src/theme/static/toc.less
index 85aae8878..908291644 100644
--- a/site/src/theme/static/toc.less
+++ b/site/src/theme/static/toc.less
@@ -69,7 +69,7 @@ ul.toc > li {
 
 .toc-affix {
   position: absolute;
-  top: 80px;
+  top: 118px;
   right: 0px;
   width: 160px;
   padding: 8px 8px 8px 4px;
diff --git a/site/src/views/ComponentOverview.less b/site/src/views/ComponentOverview.less
index 68f7d665d..1fd575ba9 100644
--- a/site/src/views/ComponentOverview.less
+++ b/site/src/views/ComponentOverview.less
@@ -23,6 +23,18 @@
       box-shadow: var(--shadow-2);
     }
   }
+
+  &-affix {
+    transition: all 0.25s;
+  }
+
+  &-affixed {
+    padding: 12px;
+    margin: -8px;
+    border-radius: 6px;
+    border: 1px solid var(--border-color-base);
+    background-color: var(--body-background);
+  }
 }
 
 .components-overview-search {
diff --git a/site/src/views/ComponentOverview.vue b/site/src/views/ComponentOverview.vue
index 8fa4862a7..5158ff5e3 100644
--- a/site/src/views/ComponentOverview.vue
+++ b/site/src/views/ComponentOverview.vue
@@ -12,17 +12,25 @@
       </p>
     </section>
     <a-divider></a-divider>
-    <a-input
-      ref="inputRef"
-      v-model:value="search"
-      :placeholder="$t('app.components.overview.search')"
-      class="components-overview-search"
-      auto-focus
-    >
-      <template #suffix>
-        <SearchOutlined />
-      </template>
-    </a-input>
+    <a-affix :offset-top="32" @change="handleAffixChange">
+      <div
+        class="components-overview-affix"
+        :class="{ 'components-overview-affixed': searchBarAffixed }"
+      >
+        <a-input
+          ref="inputRef"
+          v-model:value="search"
+          :placeholder="$t('app.components.overview.search')"
+          class="components-overview-search"
+          auto-focus
+          :style="{ fontSize: searchBarAffixed ? '18px' : '' }"
+        >
+          <template #suffix>
+            <SearchOutlined />
+          </template>
+        </a-input>
+      </div>
+    </a-affix>
     <a-divider></a-divider>
     <template v-for="group in menuItems" :key="group.title">
       <div class="components-overview">
@@ -84,6 +92,12 @@ export default defineComponent({
     const search = ref('');
     const inputRef = ref();
     const { dataSource } = useMenus();
+
+    const searchBarAffixed = ref(false);
+    function handleAffixChange(affixed?: boolean) {
+      searchBarAffixed.value = affixed;
+    }
+
     const menuItems = computed(() => {
       return [
         {
@@ -144,6 +158,8 @@ export default defineComponent({
       inputRef,
       isZhCN: globalConfig?.isZhCN,
       isDark,
+      searchBarAffixed,
+      handleAffixChange,
     };
   },
 });