diff --git a/static/package-lock.json b/static/package-lock.json
index aefdb1e..94f3c66 100644
--- a/static/package-lock.json
+++ b/static/package-lock.json
@@ -4219,11 +4219,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4236,15 +4238,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4347,7 +4352,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4357,6 +4363,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4369,17 +4376,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -4396,6 +4406,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4468,7 +4479,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4478,6 +4490,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4583,6 +4596,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css
index 0696913..affab38 100644
--- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css
+++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.css
@@ -7,7 +7,7 @@
 
 .scroll-btn-right {
   top: 50px;
-  left: calc(100vw - 45px);
+  left: calc(100vw - 50px);
 }
 
 .scroll-btn mat-icon {
diff --git a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts
index 8b2eed2..07f6a65 100644
--- a/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts
+++ b/static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts
@@ -1,4 +1,14 @@
-import {Component, ElementRef, EventEmitter, Input, OnChanges, Output, ViewChild} from '@angular/core';
+import {
+  AfterViewInit,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges,
+  ViewChild
+} from '@angular/core';
 import {Campaign} from '../../../models/model-interfaces';
 import {LoginService} from '../../../services/app-user-service/login-service';
 
@@ -30,8 +40,10 @@ export class CampaignNavigationComponent implements OnChanges {
   constructor(public loginService: LoginService) {
   }
 
-  ngOnChanges() {
-    this.isRightScrollVisible = this.campaigns.length > 4;
+  ngOnChanges(changes: SimpleChanges) {
+    if (!changes.selectedCampaignId) {
+      this.isRightScrollVisible = this.campaigns.length > 4;
+    }
   }
 
   select(campaign) {