diff --git a/lib/ash_hq_web/components/doc_sidebar.ex b/lib/ash_hq_web/components/doc_sidebar.ex
index 610707f..56a6739 100644
--- a/lib/ash_hq_web/components/doc_sidebar.ex
+++ b/lib/ash_hq_web/components/doc_sidebar.ex
@@ -30,6 +30,19 @@ defmodule AshHqWeb.Components.DocSidebar do
 
   @spec render(any) :: Phoenix.LiveView.Rendered.t()
   def render(assigns) do
+    selected_versions =
+      if assigns[:library_version] do
+        Map.put(
+          assigns[:selected_versions] || %{},
+          assigns[:library_version].library_id,
+          assigns[:library_version].id
+        )
+      else
+        assigns[:selected_versions]
+      end
+
+    assigns = assign(assigns, :selected_versions, selected_versions)
+
     assigns =
       assign(
         assigns,
diff --git a/lib/ash_hq_web/helpers.ex b/lib/ash_hq_web/helpers.ex
index 5ce25c2..2257d13 100644
--- a/lib/ash_hq_web/helpers.ex
+++ b/lib/ash_hq_web/helpers.ex
@@ -62,7 +62,7 @@ defmodule AshHqWeb.Helpers do
       else
         case Enum.find(library.versions, &(&1.id == selected_versions[library.id])) do
           nil ->
-            nil
+            AshHqWeb.Helpers.latest_version(library)
 
           version ->
             version