diff --git a/Panel.c b/Panel.c
index 986a9895..c43fafcd 100644
--- a/Panel.c
+++ b/Panel.c
@@ -246,8 +246,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
    if (this->scrollV < 0) {
       this->scrollV = 0;
       this->needsRedraw = true;
-   } else if (this->scrollV >= size) {
-      this->scrollV = MAXIMUM(size - 1, 0);
+   } else if (this->scrollV > size - h) {
+      this->scrollV = MAXIMUM(size - h, 0);
       this->needsRedraw = true;
    }
    // ensure selection is on screen
diff --git a/ProcessList.c b/ProcessList.c
index f434654c..5e6e917b 100644
--- a/ProcessList.c
+++ b/ProcessList.c
@@ -499,10 +499,12 @@ void ProcessList_rebuildPanel(ProcessList* this) {
 
    int currPos = Panel_getSelectedIndex(this->panel);
    int currScrollV = this->panel->scrollV;
+   int currSize = Panel_size(this->panel);
 
    Panel_prune(this->panel);
    int size = ProcessList_size(this);
    int idx = 0;
+
    for (int i = 0; i < size; i++) {
       Process* p = ProcessList_get(this, i);
 
@@ -513,12 +515,23 @@ void ProcessList_rebuildPanel(ProcessList* this) {
          continue;
 
       Panel_set(this->panel, idx, (Object*)p);
-      if ((this->following == -1 && idx == currPos) || (this->following != -1 && p->pid == this->following)) {
+
+      if (this->following != -1 && p->pid == this->following) {
          Panel_setSelected(this->panel, idx);
          this->panel->scrollV = currScrollV;
       }
       idx++;
    }
+
+   if (this->following == -1) {
+      /* If the last item was selected, keep the new last item selected */
+      if (currPos == currSize - 1)
+         Panel_setSelected(this->panel, Panel_size(this->panel) - 1);
+      else
+         Panel_setSelected(this->panel, currPos);
+
+      this->panel->scrollV = currScrollV;
+   }
 }
 
 Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_New constructor) {