diff --git a/src/main/java/de/marhali/easyi18n/action/SettingsAction.java b/src/main/java/de/marhali/easyi18n/action/SettingsAction.java
index 42feefa..fabd792 100644
--- a/src/main/java/de/marhali/easyi18n/action/SettingsAction.java
+++ b/src/main/java/de/marhali/easyi18n/action/SettingsAction.java
@@ -3,7 +3,10 @@ package de.marhali.easyi18n.action;
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import de.marhali.easyi18n.dialog.SettingsDialog;
+import com.intellij.openapi.options.ShowSettingsUtil;
+
+import de.marhali.easyi18n.settings.ProjectSettingsConfigurable;
+
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ResourceBundle;
@@ -21,6 +24,6 @@ public class SettingsAction extends AnAction {
 
     @Override
     public void actionPerformed(@NotNull AnActionEvent e) {
-        new SettingsDialog(e.getProject()).showAndHandle();
+        ShowSettingsUtil.getInstance().showSettingsDialog(e.getProject(), ProjectSettingsConfigurable.class);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java
index b45ca2f..4fca692 100644
--- a/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java
+++ b/src/main/java/de/marhali/easyi18n/dialog/SettingsDialog.java
@@ -28,6 +28,7 @@ import java.util.ResourceBundle;
  * Plugin configuration dialog.
  * @author marhali
  */
+@Deprecated
 public class SettingsDialog {
 
     private final Project project;
diff --git a/src/main/java/de/marhali/easyi18n/model/SettingsState.java b/src/main/java/de/marhali/easyi18n/model/SettingsState.java
index dc6beb4..4e5c810 100644
--- a/src/main/java/de/marhali/easyi18n/model/SettingsState.java
+++ b/src/main/java/de/marhali/easyi18n/model/SettingsState.java
@@ -8,6 +8,7 @@ import org.jetbrains.annotations.Nullable;
  * Represents the persistent settings which can be configured.
  * @author marhali
  */
+@Deprecated
 public class SettingsState {
 
     public static final String DEFAULT_PREVIEW_LOCALE = "en";
diff --git a/src/main/java/de/marhali/easyi18n/service/SettingsService.java b/src/main/java/de/marhali/easyi18n/service/SettingsService.java
index 59f81ad..9460fa8 100644
--- a/src/main/java/de/marhali/easyi18n/service/SettingsService.java
+++ b/src/main/java/de/marhali/easyi18n/service/SettingsService.java
@@ -13,6 +13,7 @@ import org.jetbrains.annotations.NotNull;
  * @author marhali
  */
 @State(name = "EasyI18nSettings")
+@Deprecated
 public class SettingsService implements PersistentStateComponent<SettingsState> {
 
     public static SettingsService getInstance(Project project) {
@@ -30,6 +31,10 @@ public class SettingsService implements PersistentStateComponent<SettingsState>
         return state;
     }
 
+    public void setState(SettingsState state) {
+        this.state = state;
+    }
+
     @Override
     public void loadState(@NotNull SettingsState state) {
         this.state = state;