diff --git a/src/components/common/tab-storage/tab-storage.component.ts b/src/components/common/tab-storage/tab-storage.component.ts
index 4d20c4f..5726f95 100644
--- a/src/components/common/tab-storage/tab-storage.component.ts
+++ b/src/components/common/tab-storage/tab-storage.component.ts
@@ -35,10 +35,11 @@ export class TabStorageComponent {
         }
       }
 
-      if (tryCount >= 10)
+      if (tryCount < 10)
+        this.trySelectChip(index, chip, ++tryCount);
+      else
         return;
 
-      this.trySelectChip(index, chip, ++tryCount);
     }, 100);
   }
 
diff --git a/src/components/schedule/tabs/group/group.component.ts b/src/components/schedule/tabs/group/group.component.ts
index c2995d3..5a5bfdf 100644
--- a/src/components/schedule/tabs/group/group.component.ts
+++ b/src/components/schedule/tabs/group/group.component.ts
@@ -73,6 +73,7 @@ export class GroupComponent implements IScheduleTab {
       }))
       .subscribe(data => {
         this.faculties = data;
+
         if (this.selected !== null && this.selected.length >= 1) {
           let selectedFaculty = data.find(x => x.id === this.selected![0].index);
 
diff --git a/src/components/schedule/tabs/tabs.component.ts b/src/components/schedule/tabs/tabs.component.ts
index e85a3f0..9dbf963 100644
--- a/src/components/schedule/tabs/tabs.component.ts
+++ b/src/components/schedule/tabs/tabs.component.ts
@@ -64,8 +64,10 @@ export class TabsComponent implements AfterViewInit {
     if (selected !== null)
       index = selected.type;
 
-    this.chooseTabs(index).then();
-    this.tabs.selectedIndex = index;
+    if (this.tabs.selectedIndex === null || this.tabs.selectedIndex === 0)
+      this.chooseTabs(0).then();
+    else
+      this.tabs.selectedIndex = index;
   }
 
   protected groupSelected(id: number) {