diff --git a/layouts/_default/list.html b/layouts/_default/list.html
index e45ddd049..80b6d4cda 100644
--- a/layouts/_default/list.html
+++ b/layouts/_default/list.html
@@ -1,4 +1,5 @@
 {{ partial "header.html" . }}
+{{ partial "topnav.html" . }}
 
 <div class="page-wrapper">
   {{ partial "sidebar.html" . }}
diff --git a/layouts/_default/section.html b/layouts/_default/section.html
index fa7e6f2b5..d1a451781 100644
--- a/layouts/_default/section.html
+++ b/layouts/_default/section.html
@@ -1,4 +1,5 @@
-{{ partial "header.html" . }}
+{{ partial "header.html" . }}\
+{{ partial "topnav.html" . }}
 
 <div class="page-wrapper">
   {{ partial "sidebar.html" . }}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index fa7e6f2b5..3d220b47a 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -1,4 +1,5 @@
 {{ partial "header.html" . }}
+{{ partial "topnav.html" . }}
 
 <div class="page-wrapper">
   {{ partial "sidebar.html" . }}
diff --git a/layouts/_default/tags-landing.html b/layouts/_default/tags-landing.html
index 0456ff1d2..1180f0788 100644
--- a/layouts/_default/tags-landing.html
+++ b/layouts/_default/tags-landing.html
@@ -1,4 +1,5 @@
 {{ partial "header.html" . }}
+{{ partial "topnav.html" . }}
 
 <div class="page-wrapper">
   {{ partial "sidebar.html" . }}
diff --git a/layouts/_default/version-landing.html b/layouts/_default/version-landing.html
index 445223099..5b632b656 100644
--- a/layouts/_default/version-landing.html
+++ b/layouts/_default/version-landing.html
@@ -1,4 +1,5 @@
 {{ partial "header.html" . }}
+{{ partial "topnav.html" . }}
 
 {{ $productPathData := findRE "[^/]+.*?" .RelPermalink }}
 {{ $product := index $productPathData 0 }}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index 0af368446..d8b3846e3 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -31,4 +31,3 @@
   </head>
   <body>
     {{ partial "header/google-analytics-body.html" }}
-    {{ partial "topnav.html" . }}
diff --git a/layouts/partials/topnav.html b/layouts/partials/topnav.html
index baacd7afd..4321556a4 100644
--- a/layouts/partials/topnav.html
+++ b/layouts/partials/topnav.html
@@ -1,7 +1,3 @@
-{{ $productPathData := findRE "[^/]+.*?" .RelPermalink }}
-{{ $product := index $productPathData 0 }}
-{{ $currentVersion := index $productPathData 1 }}
-
 <div class="topnav">
   <div class="topnav--left">
     <a class="influx-home" href="https://www.influxdata.com" title="InfluxData"><span class="icon-influx-logo"></span><span class="icon-influx-logotype"></span></a>
@@ -9,20 +5,7 @@
     <a class="docs-home" href="/{{ $.Site.Data.versions.stable_version }}">InfluxDB Docs</a>
   </div>
   <div class="topnav--right">
-    {{ if or (eq $product nil) (eq $currentVersion nil) }}
-    {{ else }}
-    <div class="version-selector">
-      <p class="selected">{{ $currentVersion }}</p>
-      <ul class="version-list">
-        <li><a href="https://github.com/influxdata/docs.influxdata.com" class="legacy" target="_blank">older</a></li>
-        {{ range (index .Site.Data.products $product).versions }}
-          <li>
-            <a href="/{{ $product }}/{{ . }}" {{ if eq . $currentVersion }}class="active"{{ end }}>{{ . }}</a>
-          </li>
-        {{ end }}
-      </ul>
-    </div>
-    {{ end }}
+    {{ partial "topnav/version-selector.html" . }}
     <button id="search-btn" onclick="toggle_sidebar('sidebar-open');document.getElementById('algolia-search-input').focus();return false;"><span class="icon-search"></span></button>
     <button class="url-trigger" href="#"><span class="icon-ui-cog-thick"></span></button>
     <button class="theme-switcher" id="theme-switch-light" onclick="switch_style('light-theme');return false;"><span class="icon-sun1"></span></button>
