diff --git a/MetersPanel.c b/MetersPanel.c
index 4f7100ce9af7c48baa6597817afaea068814e05b..927d10c0229bb844fbce382286e29528eaf96cc6 100644
--- a/MetersPanel.c
+++ b/MetersPanel.c
@@ -171,6 +171,7 @@ static HandlerResult MetersPanel_eventHandler(Panel* super, int ch) {
             Vector_remove(this->meters, selected);
             Panel_remove(super, selected);
          }
+         MetersPanel_setMoving(this, false);
          result = HANDLED;
          break;
       }
diff --git a/Panel.c b/Panel.c
index 7424fa49e451b8f933812adc57f10152604d1e5d..16abc2484fbb069c05e3a77f7848dd422cd70a24 100644
--- a/Panel.c
+++ b/Panel.c
@@ -256,7 +256,7 @@ void Panel_setSelected(Panel* this, int selected) {
 
    int size = Vector_size(this->items);
    if (selected >= size) {
-      return;
+      selected = size - 1;
    }
    if (selected < 0)
       selected = 0;