diff --git a/app/src/main/java/helium314/keyboard/latin/setup/SetupActivity.java b/app/src/main/java/helium314/keyboard/latin/setup/SetupActivity.java
index 751308c0..4e987975 100644
--- a/app/src/main/java/helium314/keyboard/latin/setup/SetupActivity.java
+++ b/app/src/main/java/helium314/keyboard/latin/setup/SetupActivity.java
@@ -9,13 +9,20 @@ package helium314.keyboard.latin.setup;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.inputmethod.InputMethodManager;
+
+import helium314.keyboard.latin.utils.UncachedInputMethodManagerUtils;
+import helium314.keyboard.settings.SettingsActivity;
 
 public final class SetupActivity extends Activity {
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         final Intent intent = new Intent();
-        intent.setClass(this, SetupWizardActivity.class);
+        final InputMethodManager imm = (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE);
+        if (UncachedInputMethodManagerUtils.isThisImeCurrent(this, imm))
+            intent.setClass(this, SettingsActivity.class);
+        else intent.setClass(this, SetupWizardActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
                 | Intent.FLAG_ACTIVITY_NEW_TASK);
         startActivity(intent);