diff --git a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html
index 26532c0c2..f9578d3c6 100644
--- a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html
+++ b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.html
@@ -2,43 +2,48 @@
   <ul class="nav nav-tabs mt-2" id="myTab" role="tablist">
     <li class="nav-item">
       <a
-        class="nav-link active nav-active text-black font-weight-bold"
+        class="nav-link nav-active text-black font-weight-bold"
+        [ngClass]="{ active: activeTab === 'customer-information' }"
         id="customer-information-tab"
         data-toggle="tab"
         href="#customer-information"
         role="tab"
         aria-controls="customer-information"
+        (click)="showTab('customer-information')"
         >Customer information</a
       >
     </li>
     <li class="nav-item">
       <a
         class="nav-link text-black font-weight-bold"
-        [ngClass]="{ 'nav-active': areTabsActive, disabled: !areTabsActive }"
+        [ngClass]="{ 'nav-active': areTabsActive, disabled: !areTabsActive, active: activeTab === 'projects-type' }"
         id="projects-type-tab"
         data-toggle="tab"
         href="#projectsType"
         role="tab"
         aria-controls="projects-type"
+        (click)="showTab('projects-type')"
         >Project types</a
       >
     </li>
     <li class="nav-item">
       <a
         class="nav-link text-black font-weight-bold"
-        [ngClass]="{ 'nav-active': areTabsActive, disabled: !areTabsActive }"
+        [ngClass]="{ 'nav-active': areTabsActive, disabled: !areTabsActive, active: activeTab === 'projects' }"
         id="projects-tab"
         data-toggle="tab"
         href="#projects"
         role="tab"
         aria-controls="projects"
+        (click)="showTab('projects')"
         >Projects</a
       >
     </li>
   </ul>
   <div class="tab-content" id="myTabContent">
     <div
-      class="tab-pane fade show active mt-3"
+      class="tab-pane fade mt-3"
+      [ngClass]="{ 'show active': activeTab === 'customer-information' }"
       id="customer-information"
       role="tabpanel"
       aria-labelledby="customer-information-tab"
@@ -48,17 +53,29 @@
         (changeValueAreTabsActives)="activeTabs($event)"
       ></app-create-customer>
     </div>
-    <div class="tab-pane fade mt-3" id="projects" role="tabpanel" aria-labelledby="projects-tab">
-      <div class="container mb-1">
-        <app-create-project></app-create-project>
-        <app-project-list></app-project-list>
-      </div>
-    </div>
-    <div class="tab-pane fade mt-3" id="projectsType" role="tabpanel" aria-labelledby="projects-type-tab">
+    <div
+      class="tab-pane fade mt-3"
+      [ngClass]="{ 'show active': activeTab === 'projects-type' }"
+      id="projectsType"
+      role="tabpanel"
+      aria-labelledby="projects-type-tab"
+    >
       <div class="container">
         <app-create-project-type></app-create-project-type>
         <app-project-type-list></app-project-type-list>
       </div>
     </div>
+    <div
+      class="tab-pane fade mt-3"
+      [ngClass]="{ 'show active': activeTab === 'projects' }"
+      id="projects"
+      role="tabpanel"
+      aria-labelledby="projects-tab"
+    >
+      <div class="container mb-1">
+        <app-create-project></app-create-project>
+        <app-project-list></app-project-list>
+      </div>
+    </div>
   </div>
 </div>
diff --git a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.spec.ts b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.spec.ts
index d11f58343..a4801fff3 100644
--- a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.spec.ts
+++ b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.spec.ts
@@ -27,6 +27,25 @@ describe('ManagmentCustomerProjectsComponent', () => {
     component.activeTabs(true);
     setTimeout(() => {
       expect(component.areTabsActive).toBeTrue();
+      expect(component.activeTab).toEqual('customer-information');
     }, 1);
   });
+
+  it('should show customer-information tab', () => {
+    component.areTabsActive = true;
+    component.showTab('customer-information');
+    expect(component.activeTab).toEqual('customer-information');
+  });
+
+  it('should show projects-type tab', () => {
+    component.areTabsActive = true;
+    component.showTab('projects-type');
+    expect(component.activeTab).toEqual('projects-type');
+  });
+
+  it('should show projects tab', () => {
+    component.areTabsActive = true;
+    component.showTab('projects');
+    expect(component.activeTab).toEqual('projects');
+  });
 });
diff --git a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts
index 0d6aac905..b70ec3658 100644
--- a/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts
+++ b/src/app/modules/customer-management/components/management-customer-projects/management-customer-projects.component.ts
@@ -7,10 +7,18 @@ import { Component } from '@angular/core';
 })
 export class ManagementCustomerProjectsComponent {
   areTabsActive: boolean;
-
+  activeTab: string;
   constructor() {}
 
   activeTabs($areTabsActive: boolean) {
-    setTimeout(() => this.areTabsActive = $areTabsActive, 1);
+    setTimeout(() => {
+      this.areTabsActive = $areTabsActive;
+      this.activeTab = 'customer-information';
+    }, 1);
+  }
+
+  showTab(activeTab: string) {
+    this.activeTab = activeTab;
   }
+
 }
diff --git a/src/app/modules/time-entries/pages/time-entries.component.spec.ts b/src/app/modules/time-entries/pages/time-entries.component.spec.ts
index 63e90be1b..7854dc7ed 100644
--- a/src/app/modules/time-entries/pages/time-entries.component.spec.ts
+++ b/src/app/modules/time-entries/pages/time-entries.component.spec.ts
@@ -83,7 +83,7 @@ describe('TimeEntriesComponent', () => {
 
   it('should call dataByMonth in ngOnInit()', async(() => {
     component.ngOnInit();
-    expect(component.dataByMonth.length).toEqual(1);
+    expect(component.dataByMonth.length).toEqual(0);
   }));
 
   it('should open Delete Modal', () => {