diff --git a/app/src/main/java/org/audiveris/omr/Main.java b/app/src/main/java/org/audiveris/omr/Main.java
index b6ca01072..943463b40 100644
--- a/app/src/main/java/org/audiveris/omr/Main.java
+++ b/app/src/main/java/org/audiveris/omr/Main.java
@@ -44,6 +44,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
+import java.util.TreeSet;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
@@ -400,10 +402,12 @@ public static void setLocale (Locale locale)
      */
     private static void showEnvironment ()
     {
-        for (String var : new String[] { "FLATPAK_ID", "FLATPAK_REF", "FLATPAK_SANDBOX_DIR",
-                "XDG_SESSION_TYPE" }) {
-            logger.info("{} env: {} prop: {}", var, System.getenv(var), System.getProperty(var));
+        if (constants.showAllEnvironmentVariables.isSet()) {
+            final Map<String, String> map = System.getenv();
+            final TreeSet<String> keys = new TreeSet<>(map.keySet());
+            keys.forEach(k -> logger.info("{} : {}", k, map.get(k)));
         }
+
         if (constants.showEnvironment.isSet()) {
             logger.info(
                     """
@@ -434,6 +438,10 @@ private static class Constants
                 true,
                 "Should we show environment?");
 
+        private final Constant.Boolean showAllEnvironmentVariables = new Constant.Boolean(
+                true,
+                "Should we show all environment variables?");
+
         private final Constant.String locale = new Constant.String(
                 "en",
                 "Locale language to be used in the whole application (en, fr)");