1 files changed, 7 insertions, 2 deletions
diff --git a/src/components/data_table/draw.rs b/src/components/data_table/draw.rs
index 3903f381..91fef6ba 100644
--- a/src/components/data_table/draw.rs
+++ b/src/components/data_table/draw.rs
@@ -200,10 +200,15 @@ where
                 self.props.table_gap
             };
 
-            let columns = &self.columns;
             if !self.data.is_empty() || !self.first_draw {
-                self.first_draw = false; // TODO: Doing it this way is fine, but it could be done better (e.g. showing custom no results/entries message)
+                if self.first_draw {
+                    self.first_draw = false; // TODO: Doing it this way is fine, but it could be done better (e.g. showing custom no results/entries message)
+                    if let Some(first_index) = self.first_index {
+                        self.set_position(first_index);
+                    }
+                }
 
+                let columns = &self.columns;
                 let rows = {
                     let num_rows =
                         usize::from(inner_height.saturating_sub(table_gap + header_height));