diff --git a/app/src/processing/app/contrib/ContributionManagerDialog.java b/app/src/processing/app/contrib/ContributionManagerDialog.java
index b8136314e..bb0658c7b 100644
--- a/app/src/processing/app/contrib/ContributionManagerDialog.java
+++ b/app/src/processing/app/contrib/ContributionManagerDialog.java
@@ -156,9 +156,11 @@ public class ContributionManagerDialog {
       @Override
       public void stateChanged(ChangeEvent e) {
         // When the tab is changed update status to the current selected panel
-        getActiveTab().contributionListPanel
-          .setSelectedPanel(getActiveTab().contributionListPanel
-            .getSelectedPanel());
+        ContributionPanel currentPanel = getActiveTab().contributionListPanel
+          .getSelectedPanel();
+        if (currentPanel != null) {
+          getActiveTab().contributionListPanel.setSelectedPanel(currentPanel);
+        }
       }
     });