diff --git a/packages/demo/src/app/common/version.service.ts b/packages/demo/src/app/common/version.service.ts
index a42f702740..35dad3e138 100644
--- a/packages/demo/src/app/common/version.service.ts
+++ b/packages/demo/src/app/common/version.service.ts
@@ -61,7 +61,7 @@ class PackageVersion {
 })
 export class VersionService {
   public get currentVersion(): Observable<PackageVersion> {
-    return this.versions.pipe(map(versions => versions.find(v => v.isCurrent)));
+    return this.versions.pipe(map(versions => versions[0]));
   }
 
   public get versions(): Observable<PackageVersion[]> {
diff --git a/packages/demo/src/app/layout-container/layout-container.component.html b/packages/demo/src/app/layout-container/layout-container.component.html
index 69b24296dc..1bad4ac93c 100644
--- a/packages/demo/src/app/layout-container/layout-container.component.html
+++ b/packages/demo/src/app/layout-container/layout-container.component.html
@@ -7,13 +7,8 @@
       <button class="btn btn-link dropdown-button" id="versionDropdownButton" ngbDropdownToggle>
         {{ (currentVersion$ | async)?.title }}
       </button>
-      <div ngbDropdownMenu aria-labelledby="versionDropdown">
-        <a
-          *ngFor="let version of versions$ | async"
-          [href]="isLatest ? 'https://design-system.post.ch' : version.url"
-          [class.active]="version.isCurrent"
-          ngbDropdownItem
-        >
+      <div ngbDropdownMenu aria-labelledby="versionDropdown" class="dropdown-menu-end">
+        <a *ngFor="let version of versions$ | async" [href]="version.url" ngbDropdownItem>
           <span class="bold">{{ version.title }}</span>
           <div class="small mt-2 icons" *ngIf="version.dependencies">
             <span