diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index fecf58c83..d5c4f69ac 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -312,6 +312,9 @@ public class Base {
     // Setup board-dependent variables.
     onBoardOrPortChange();
 
+    this.pdeKeywords = new PdeKeywords();
+    this.pdeKeywords.reload();
+
     CommandlineParser parser = CommandlineParser.newCommandlineParser(args);
 
     for (String path : parser.getFilenames()) {
@@ -348,9 +351,6 @@ public class Base {
     // them.
     PreferencesData.save();
 
-    this.pdeKeywords = new PdeKeywords();
-    this.pdeKeywords.reload();
-
     if (parser.isInstallBoard()) {
       ContributionsIndexer indexer = new ContributionsIndexer(BaseNoGui.getSettingsFolder());
       ContributionInstaller installer = new ContributionInstaller(indexer) {