diff --git a/nb/ide.branding/build.xml b/nb/ide.branding/build.xml
index 29cd0a8544b6..6dc67cd50a03 100644
--- a/nb/ide.branding/build.xml
+++ b/nb/ide.branding/build.xml
@@ -42,6 +42,7 @@ Contributor(s): Vincent Brabant, Maxym Mykhalchuk
     </copy>
     <replace file="${build.dir}/branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties" value="defaultvalue" propertyFile="${nb_all}/nbbuild/build/netbeansrelease.properties">
         <replacefilter token="@@metabuild.ComputedSplashVersion@@" property="metabuild.ComputedSplashVersion"/>
+        <replacefilter token="@@metabuild.ComputedTitleVersion@@" property="metabuild.ComputedTitleVersion"/>
     </replace>
     <locjar warnMissingDir="true"
       basedir="${build.dir}/branding/core.startup/src"
diff --git a/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
index 2630e071b994..3a5c1e8f27a4 100644
--- a/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
+++ b/nb/ide.branding/core.startup/src/org/netbeans/core/startup/Bundle_nb.properties
@@ -63,6 +63,7 @@ SplashVersionTextHorizontalAlignment=right
 
 LBL_splash_window_title=Starting Apache NetBeans IDE
 currentVersion=Apache NetBeans IDE @@metabuild.ComputedSplashVersion@@
+AWT_AppClassName=Apache NetBeans IDE @@metabuild.ComputedTitleVersion@@
 
 MSG_warning=NetBeans IDE - Warning
 MSG_info=NetBeans IDE - Information
diff --git a/platform/core.startup/src/org/netbeans/core/startup/Bundle.properties b/platform/core.startup/src/org/netbeans/core/startup/Bundle.properties
index 219489796e45..22c5ca4963e7 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/Bundle.properties
+++ b/platform/core.startup/src/org/netbeans/core/startup/Bundle.properties
@@ -28,6 +28,9 @@ OpenIDE-Module-Long-Description=\
 # {0} - build number
 currentVersion=Apache NetBeans Platform Dev (Build {0})
 
+# AppClassName - used on Linux for configuring WM_CLASS
+AWT_AppClassName=Apache NetBeans Platform
+
 ERR_no_user_directory=netbeans.user is not set.\nPlease check your NetBeans startup script.
 # {0} - userdir full path
 # {1} - inst full path
diff --git a/platform/core.startup/src/org/netbeans/core/startup/Main.java b/platform/core.startup/src/org/netbeans/core/startup/Main.java
index f75009e6d088..d25ef866968a 100644
--- a/platform/core.startup/src/org/netbeans/core/startup/Main.java
+++ b/platform/core.startup/src/org/netbeans/core/startup/Main.java
@@ -19,9 +19,11 @@
 
 package org.netbeans.core.startup;
 
+import java.awt.Toolkit;
 import java.beans.Introspector;
 import java.io.File;
 import java.io.IOException;
+import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.net.URL;
@@ -247,6 +249,7 @@ static void start (String[] args) throws SecurityException {
     if (CLIOptions.isGui ()) {
         try {
             java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment();
+            configureAWTAppClassName();
         } catch (java.lang.InternalError exc) {
             String s = NbBundle.getMessage(Main.class, "EXC_GraphicsStartFails1", exc.getMessage());
             System.out.println(s);
@@ -345,7 +348,7 @@ private static void rm(File f) {
             Logger.getLogger(Main.class.getName()).log(Level.WARNING, "Failed to delete {0}", f);
         }
     }
-  
+
     /** Loads a class from available class loaders. */
     private static final Class getKlass(String cls) {
         try {
@@ -363,6 +366,24 @@ private static final Class getKlass(String cls) {
         }
     }
 
+    // moved from MainWindow::init to handle splash, etc.
+    private static void configureAWTAppClassName() {
+        Toolkit toolkit = Toolkit.getDefaultToolkit();
+        Class<?> xtoolkit = toolkit.getClass();
+        if (xtoolkit.getName().equals("sun.awt.X11.XToolkit")) { //NOI18N
+            // TODO those add --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED
+
+            //#183739 / JDK-6528430 - provide proper app name on Linux
+            try {
+                final Field awtAppClassName = xtoolkit.getDeclaredField("awtAppClassName"); //NOI18N
+                awtAppClassName.setAccessible(true);
+                awtAppClassName.set(null, NbBundle.getMessage(Main.class, "AWT_AppClassName", "").strip()); //NOI18N
+            } catch (Exception x) {
+                Logger.getLogger(Main.class.getName()).log(Level.FINE, "can't change X11 application name", x);
+            }
+        }
+    }
+
     /** Does import of userdir. Made non-private just for testing purposes.
      *
      * @return true if the execution should continue or false if it should
diff --git a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
index 8320bfd81f0c..c78d4fb33a9d 100755
--- a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
+++ b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
@@ -23,7 +23,6 @@
 import java.awt.*;
 import java.awt.event.*;
 import java.io.File;
-import java.lang.reflect.Field;
 import java.util.*;
 import java.util.List;
 import java.util.logging.Level;
@@ -116,21 +115,6 @@ public static void init() {
        if (mainMenuBar == null) {
            mainMenuBar = createMenuBar();
            ToolbarPool.getDefault().waitFinished();
-
-           Toolkit toolkit = Toolkit.getDefaultToolkit();
-           Class<?> xtoolkit = toolkit.getClass();
-           if (xtoolkit.getName().equals("sun.awt.X11.XToolkit")) { //NOI18N
-               // TODO those add --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED
-
-               //#183739 / JDK-6528430 - provide proper app name on Linux
-               try {
-                    final Field awtAppClassName = xtoolkit.getDeclaredField("awtAppClassName"); //NOI18N
-                    awtAppClassName.setAccessible(true);
-                    awtAppClassName.set(null, NbBundle.getMessage(MainWindow.class, "CTL_MainWindow_Title_No_Project", "").strip()); //NOI18N
-               } catch (Exception x) {
-                   LOGGER.log(Level.FINE, "can't change X11 application name", x);
-               }
-           }
        }
 
        logLookAndFeelUsage();