diff --git a/core.windows/src/org/netbeans/core/windows/persistence/PersistenceManager.java b/core.windows/src/org/netbeans/core/windows/persistence/PersistenceManager.java
--- a/core.windows/src/org/netbeans/core/windows/persistence/PersistenceManager.java
+++ b/core.windows/src/org/netbeans/core/windows/persistence/PersistenceManager.java
@@ -768,9 +768,11 @@
         for (Map.Entry<String, Reference<TopComponent>> curEntry: copyIdToTopComponentMap.entrySet()) {
             TopComponent curTC = curEntry.getValue().get();
             if (curTC != null) {
-                if ((!curTC.isOpened()) && (!isTopComponentPersistentWhenClosed(curTC))) {
+                if ( (!isTopComponentPersistent(curTC)) ||
+                        ((!curTC.isOpened()) && (!isTopComponentPersistentWhenClosed(curTC)))) {
                     //We do not want to save closed TC which has persistence type
                     //PERSISTENCE_ONLY_OPENED or PERSISTENCE_NEVER
+                    // #158691 save olny persistent TC
                     continue;
                 }
                 try {