diff --git a/gui/designwidget.cc b/gui/designwidget.cc
index 91ec5163..7c40f16a 100644
--- a/gui/designwidget.cc
+++ b/gui/designwidget.cc
@@ -229,6 +229,7 @@ void DesignWidget::addToHistory(QTreeWidgetItem *item)
 
 void DesignWidget::newContext(Context *ctx)
 {
+    highlightSelected.clear();
     treeWidget->clear();
     // reset pointers since they are not valid after clear
     nets_root = nullptr;
diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc
index 9343419b..e21af678 100644
--- a/gui/fpgaviewwidget.cc
+++ b/gui/fpgaviewwidget.cc
@@ -289,6 +289,9 @@ FPGAViewWidget::~FPGAViewWidget() {}
 void FPGAViewWidget::newContext(Context *ctx)
 {
     ctx_ = ctx;
+    onSelectedArchItem(std::vector<DecalXY>());
+    for (int i = 0; i < 8; i++)
+        onHighlightGroupChanged(std::vector<DecalXY>(), i);
     pokeRenderer();
 }