diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
index 69ded90ac2..fc156b103f 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.html
@@ -143,7 +143,7 @@
 
 <ng-template #language>
   <li class="nav-item">
-    <div ngbDropdown display="static">
+    <div class="dropdown" ngbDropdown #languageDropdown="ngbDropdown" display="static">
       <a
         ngbDropdownToggle
         class="nav-link"
@@ -157,17 +157,20 @@
         {{ defaultLanguage$ | async }}
       </a>
       <div
-        ngbDropdownMenu
         class="dropdown-menu dropdown-menu-right border-0 shadow-sm"
         aria-labelledby="dropdownMenuLink"
+        [class.d-block]="smallScreen"
+        [class.overflow-hidden]="smallScreen"
       >
-        <a
-          *ngFor="let lang of dropdownLanguages$ | async"
-          href="javascript:void(0)"
-          class="dropdown-item"
-          (click)="onChangeLang(lang.cultureName)"
-          >{{ lang?.displayName }}</a
-        >
+        <div class="abp-collapsed" [class.expanded]="smallScreen ? languageDropdown.isOpen() : true">
+          <a
+            *ngFor="let lang of dropdownLanguages$ | async"
+            href="javascript:void(0)"
+            class="dropdown-item"
+            (click)="onChangeLang(lang.cultureName)"
+            >{{ lang?.displayName }}</a
+          >
+        </div>
       </div>
     </div>
   </li>
@@ -189,24 +192,18 @@
         {{ (currentUser$ | async)?.userName }}
       </a>
       <div
-        ngbDropdownMenu
         class="dropdown-menu dropdown-menu-right border-0 shadow-sm"
         aria-labelledby="dropdownMenuLink"
         [class.overflow-hidden]="smallScreen"
         [class.d-block]="smallScreen"
       >
-        <ng-container *ngTemplateOutlet="!smallScreen ? currentUserElements : null"></ng-container>
-        <ng-template #currentUserElements>
+        <div class="abp-collapsed" [class.expanded]="smallScreen ? currentUserDropdown.isOpen() : true">
           <a class="dropdown-item" routerLink="/account/manage-profile">{{
             'AbpAccount::ManageYourProfile' | abpLocalization
           }}</a>
           <a class="dropdown-item" href="javascript:void(0)" (click)="logout()">{{
             'AbpUi::Logout' | abpLocalization
           }}</a>
-        </ng-template>
-
-        <div *ngIf="smallScreen" [@collapseWithMargin]="currentUserDropdown.isOpen() ? 'expanded' : 'collapsed'">
-          <ng-container *ngTemplateOutlet="currentUserElements"></ng-container>
         </div>
       </div>
     </div>
diff --git a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
index 5687f56386..d51ca54062 100644
--- a/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
+++ b/npm/ng-packs/packages/theme-basic/src/lib/components/application-layout/application-layout.component.ts
@@ -108,19 +108,21 @@ export class ApplicationLayoutComponent implements AfterViewInit, OnDestroy {
     this.navbarRootDropdowns.forEach(item => {
       item.close();
     });
-    if (window.innerWidth < 768) {
-      this.isDropdownChildDynamic = false;
-      if (this.smallScreen === false) {
-        this.isCollapsed = false;
-        setTimeout(() => {
-          this.isCollapsed = true;
-        }, 100);
+    setTimeout(() => {
+      if (window.innerWidth < 768) {
+        this.isDropdownChildDynamic = false;
+        if (this.smallScreen === false) {
+          this.isCollapsed = false;
+          setTimeout(() => {
+            this.isCollapsed = true;
+          }, 100);
+        }
+        this.smallScreen = true;
+      } else {
+        this.isDropdownChildDynamic = true;
+        this.smallScreen = false;
       }
-      this.smallScreen = true;
-    } else {
-      this.isDropdownChildDynamic = true;
-      this.smallScreen = false;
-    }
+    }, 0);
   }
 
   ngAfterViewInit() {
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts b/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
index a53bd4573b..654827fbc8 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/contants/styles.ts
@@ -182,6 +182,18 @@ export default `
   animation: fadeOutTop 0.2s ease-in-out;
 }
 
+.abp-collapsed {
+  -moz-transition: margin ease-in-out 0.5s;
+  -ms-transition: margin ease-in-out 0.5s;
+  -o-transition: margin ease-in-out 0.5s;
+  -webkit-transition: margin ease-in-out 0.5s;
+  transition: margin ease-in-out 0.5s;
+  margin-top: -100%;
+}
+
+.abp-collapsed.expanded {
+  margin-top: 0 !important;
+}
 
 @keyframes fadeInTop {
   from {