diff --git a/app/src/cc/arduino/libraries/contributions/ui/LibraryManagerUI.java b/app/src/cc/arduino/libraries/contributions/ui/LibraryManagerUI.java
index 779b2d744..8ee0ba3e9 100644
--- a/app/src/cc/arduino/libraries/contributions/ui/LibraryManagerUI.java
+++ b/app/src/cc/arduino/libraries/contributions/ui/LibraryManagerUI.java
@@ -36,6 +36,7 @@ import cc.arduino.ui.InstallerJDialog;
 import cc.arduino.ui.InstallerTableCell;
 import cc.arduino.utils.Progress;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.Collection;
 
@@ -110,6 +111,15 @@ public class LibraryManagerUI extends InstallerJDialog {
         setProgress(progress);
       }
     };
+
+    if (indexer.getIndex().getLibraries().isEmpty()) {
+      SwingUtilities.invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          onUpdatePressed();
+        }
+      });
+    }
   }
 
   public void setProgress(Progress progress) {
diff --git a/app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java b/app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java
index d4d71e047..e036ce5c9 100644
--- a/app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java
+++ b/app/src/cc/arduino/packages/contributions/ui/ContributionManagerUI.java
@@ -36,6 +36,7 @@ import cc.arduino.ui.InstallerJDialog;
 import cc.arduino.ui.InstallerTableCell;
 import cc.arduino.utils.Progress;
 
+import javax.swing.*;
 import java.awt.*;
 import java.util.Collection;
 
@@ -108,6 +109,15 @@ public class ContributionManagerUI extends InstallerJDialog {
         setProgress(progress);
       }
     };
+
+    if (indexer.getIndex().getPackages().isEmpty()) {
+      SwingUtilities.invokeLater(new Runnable() {
+        @Override
+        public void run() {
+          onUpdatePressed();
+        }
+      });
+    }
   }
 
   public void setProgress(Progress progress) {