diff --git a/src/components/nominator/current_validators.rs b/src/components/nominator/current_validators.rs
index 3b81f89..be792a7 100644
--- a/src/components/nominator/current_validators.rs
+++ b/src/components/nominator/current_validators.rs
@@ -179,6 +179,7 @@ impl CurrentValidators {
         let index = self.table_state
             .selected()
             .unwrap_or_default();
+        self.scroll_state = self.scroll_state.content_length(self.individual.len());
         self.scroll_state = self.scroll_state.position(index);
     }
 }
diff --git a/src/components/validator/history.rs b/src/components/validator/history.rs
index efdc507..e61ed22 100644
--- a/src/components/validator/history.rs
+++ b/src/components/validator/history.rs
@@ -135,6 +135,7 @@ impl History {
                 });
             }
         }
+        self.scroll_state = self.scroll_state.content_length(self.rewards.len());
     }
 
     fn update_claims(&mut self, era_index: u32, is_claimed: bool) {
@@ -181,11 +182,7 @@ impl PartialComponent for History {
     fn set_active(&mut self, current_tab: CurrentTab) {
         match current_tab {
             CurrentTab::History => self.is_active = true,
-            _ => {
-                self.is_active = false;
-                //self.table_state.select(None);
-                //self.scroll_state = self.scroll_state.position(0);
-            }
+            _ => self.is_active = false,
         }
     }
 }
diff --git a/src/components/validator/nominators.rs b/src/components/validator/nominators.rs
index 21df0c9..c68a76d 100644
--- a/src/components/validator/nominators.rs
+++ b/src/components/validator/nominators.rs
@@ -57,6 +57,7 @@ impl NominatorsByValidator {
             }
         }
         self.nominators = nominators;
+        self.scroll_state = self.scroll_state.content_length(self.nominators.len());
     }
 
     fn first_row(&mut self) {
diff --git a/src/components/validator/peers.rs b/src/components/validator/peers.rs
index 37e5733..28e4233 100644
--- a/src/components/validator/peers.rs
+++ b/src/components/validator/peers.rs
@@ -51,6 +51,7 @@ impl Peers {
             }
         }
         self.peers = peers;
+        self.scroll_state = self.scroll_state.content_length(self.peers.len());
     }
 
     fn first_row(&mut self) {
diff --git a/src/components/validator/withdrawals.rs b/src/components/validator/withdrawals.rs
index 3dade8f..6a177d6 100644
--- a/src/components/validator/withdrawals.rs
+++ b/src/components/validator/withdrawals.rs
@@ -103,6 +103,7 @@ impl Withdrawals {
                 let _ = self.unlockings.insert(era_index, unlocking);
             },
         }
+        self.scroll_state = self.scroll_state.content_length(self.unlockings.len());
     }
 
     fn prepare_u128(&self, value: u128) -> String {