diff --git a/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/ApplicationWorkbenchAdvisor.java b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/ApplicationWorkbenchAdvisor.java
index c2f51e14ca880e2be043d5ee2e00e7abda36b4f0..262808a515d34a1340773ea1c58379052eadfabc 100644
--- a/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/ApplicationWorkbenchAdvisor.java
+++ b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/ApplicationWorkbenchAdvisor.java
@@ -16,6 +16,7 @@
  */
 package org.jkiss.dbeaver.core.application;
 
+import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
@@ -32,12 +33,15 @@ import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
 import org.jkiss.dbeaver.DBeaverPreferences;
 import org.jkiss.dbeaver.Log;
+import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.core.application.update.DBeaverVersionChecker;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
 import org.jkiss.dbeaver.registry.DataSourceRegistry;
 import org.jkiss.dbeaver.ui.actions.datasource.DataSourceHandler;
 import org.jkiss.dbeaver.ui.dialogs.ConfirmationDialog;
 import org.jkiss.dbeaver.ui.editors.content.ContentEditorInput;
+import org.jkiss.dbeaver.utils.GeneralUtils;
+import org.jkiss.utils.CommonUtils;
 import org.osgi.framework.Bundle;
 
 import java.net.URL;
@@ -90,6 +94,13 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
         declareWorkbenchImages(configurer);
 
         TrayDialog.setDialogHelpAvailable(true);
+
+        // Set default resource encoding to UTF-8
+        String defEncoding = DBeaverCore.getGlobalPreferenceStore().getString(DBeaverPreferences.DEFAULT_RESOURCE_ENCODING);
+        if (CommonUtils.isEmpty(defEncoding)) {
+            defEncoding = GeneralUtils.UTF8_ENCODING;
+        }
+        ResourcesPlugin.getPlugin().getPluginPreferences().setValue(ResourcesPlugin.PREF_ENCODING, defEncoding);
     }
 
     /**
diff --git a/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverApplication.java b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverApplication.java
index d232b82aba8d10168305f8baa103e0bd5f77fd87..21dbbd01d46bc99b232638b54c18590dcd80f319 100644
--- a/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverApplication.java
+++ b/plugins/org.jkiss.dbeaver.core.application/src/org/jkiss/dbeaver/core/application/DBeaverApplication.java
@@ -151,13 +151,6 @@ public class DBeaverApplication implements IApplication, DBPApplication {
         // Run instance server
         instanceServer = DBeaverInstanceServer.startInstanceServer();
 
-        // Set default resource encoding to UTF-8
-        String defEncoding = DBeaverCore.getGlobalPreferenceStore().getString(DBeaverPreferences.DEFAULT_RESOURCE_ENCODING);
-        if (CommonUtils.isEmpty(defEncoding)) {
-            defEncoding = GeneralUtils.UTF8_ENCODING;
-        }
-        ResourcesPlugin.getPlugin().getPluginPreferences().setValue(ResourcesPlugin.PREF_ENCODING, defEncoding);
-
         // Create display
         getDisplay();
 
diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
index 17a8c66c6773f99c05e8edd8de64ef7595352b30..7c328c2ab81d274569ac57272412dbe04b39898e 100644
--- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
@@ -128,6 +128,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.core.services,
  org.eclipse.e4.ui.model.workbench,
+ org.eclipse.e4.ui.services,
  org.eclipse.e4.ui.workbench.swt,
  org.eclipse.e4.ui.workbench.renderers.swt,
  org.eclipse.e4.ui.css.core,
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/PropertyDescriptor.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/PropertyDescriptor.java
index ef6b42bf3e311818ff21dd1808f1f68dbd0462c8..4755b96853a1cb25532eb5ea8eb369993ab69f0b 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/PropertyDescriptor.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/impl/PropertyDescriptor.java
@@ -43,8 +43,9 @@ public class PropertyDescriptor implements DBPPropertyDescriptor, IPropertyValue
         t_long(Long.class),
         t_float(Float.class),
         t_double(Double.class),
-        t_numeric(Double.class),
-        t_resource(IResource.class);
+        t_numeric(Double.class);
+        // Removed because it is initialized before workbench start and breaks init queue
+        //t_resource(IResource.class);
 
         private final Class<?> valueType;