diff --git a/data/nav.yaml b/data/nav.yaml
index 542264b2d..63de1591d 100644
--- a/data/nav.yaml
+++ b/data/nav.yaml
@@ -7,6 +7,7 @@
   - Separator: true
   - Path: "/downloads"
 - Path: "/solutions"
+  DropdownFromSection: true
 - Path: "/pricing"
 - Title: nav_support_us
   Dropdown:  
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
index fcf235b07..5b1e1eed5 100644
--- a/layouts/partials/nav.html
+++ b/layouts/partials/nav.html
@@ -25,7 +25,30 @@
 
       <ul class="hidden lg:flex items-stretch list-none m-0">
         {{- range .Site.Data.nav }}
-        {{- if .Dropdown }}
+        {{- if .DropdownFromSection }}
+        <!-- Dropdown generated from a section's child pages (e.g. Solutions) -->
+        {{- with $.Site.GetPage .Path }}
+        <li x-data="{ isDropdownOpen: false, openedByHover: false }" class="flex items-center mx-2 border-b-2 border-transparent" @mouseenter="isDropdownOpen = true; openedByHover = true" @mouseleave="isDropdownOpen = false; openedByHover = false" @click.outside="isDropdownOpen = false">
+          <button @click="if (!openedByHover) { isDropdownOpen = !isDropdownOpen }" class="whitespace-nowrap p-2">
+            <span>{{ .Title }}</span>
+            <i class="fa-solid fa-chevron-down text-xs"></i>
+          </button>
+          <div class="absolute">
+            <ul x-show="isDropdownOpen" x-cloak class="absolute mt-6 py-2 whitespace-nowrap bg-white rounded-sm shadow-md z-50">
+              {{- range .Pages.ByWeight }}
+              {{- if not .Params.comingsoon }}
+              <li>
+                <a href="{{ .RelPermalink }}" class="flex items-center px-4 py-2 text-gray-800 hover:bg-secondary hover:text-white hover:no-underline" data-umami-event="nav-{{ replaceRE "^.*/([^/]+)/?$" "$1" .RelPermalink }}">
+                  <span>{{ .Params.cardtitle | default .Title }}</span>
+                </a>
+              </li>
+              {{- end }}
+              {{- end }}
+            </ul>
+          </div>
+        </li>
+        {{- end }}
+        {{- else if .Dropdown }}
         <!-- Dropdown item -->
         <li x-data="{ isDropdownOpen: false, openedByHover: false }" class="flex items-center mx-2 border-b-2 border-transparent" @mouseenter="isDropdownOpen = true; openedByHover = true" @mouseleave="isDropdownOpen = false; openedByHover = false" @click.outside="isDropdownOpen = false">
           <button @click="if (!openedByHover) { isDropdownOpen = !isDropdownOpen }" class="whitespace-nowrap p-2">
@@ -120,7 +143,22 @@
   <!-- Smartphone Navigation -->
   <div :class="isNavOpen ? 'block' : 'hidden'" x-cloak class="lg:hidden {{ cond (.Scratch.Get "webinarBannerActive") "max-h-[calc(100vh-72px)]" "max-h-[calc(100vh-48px)]" }} overflow-y-auto">
     {{- range .Site.Data.nav }}
-    {{- if .Dropdown }}
+    {{- if .DropdownFromSection }}
+    <!-- Dropdown generated from a section's child pages (e.g. Solutions) -->
+    {{- with $.Site.GetPage .Path }}
+    <div class="uppercase tracking-wide text-gray-500 text-xs font-bold p-2">
+      {{ .Title }}
+    </div>
+    {{- range .Pages.ByWeight }}
+    {{- if not .Params.comingsoon }}
+    <a class="flex items-center py-2 mx-2 hover:text-secondary hover:no-underline" href="{{ .RelPermalink }}" data-umami-event="nav-{{ replaceRE "^.*/([^/]+)/?$" "$1" .RelPermalink }}">
+      <span>{{ .Params.cardtitle | default .Title }}</span>
+    </a>
+    {{- end }}
+    {{- end }}
+    <hr class="border-primary my-2"/>
+    {{- end }}
+    {{- else if .Dropdown }}
     <div class="uppercase tracking-wide text-gray-500 text-xs font-bold p-2">
       {{ i18n .Title . }}
     </div>