diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/codegeneration/CodeGenerateDialog.java b/app/src/main/java/com/stardust/scriptdroid/ui/codegeneration/CodeGenerateDialog.java
index edc9df42..e76befd0 100644
--- a/app/src/main/java/com/stardust/scriptdroid/ui/codegeneration/CodeGenerateDialog.java
+++ b/app/src/main/java/com/stardust/scriptdroid/ui/codegeneration/CodeGenerateDialog.java
@@ -126,7 +126,7 @@ public class CodeGenerateDialog extends ThemeColorMaterialDialogBuilder {
         if (selectMode.getOption(R.string.text_wait_for).checked) {
             return CodeGenerator.WAIT_FOR;
         }
-        if (selectMode.getOption(R.string.text_wait_for).checked) {
+        if (selectMode.getOption(R.string.text_selector_exists).checked) {
             return CodeGenerator.EXISTS;
         }
         return CodeGenerator.FIND_ONE;
diff --git a/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java b/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java
index c577e30b..4bcaab58 100644
--- a/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java
+++ b/autojs/src/main/java/com/stardust/autojs/codegeneration/CodeGenerator.java
@@ -66,15 +66,12 @@ public class CodeGenerator {
         generator.setUsingDesc(mUsingDesc);
         generator.setUsingId(mUsingId);
         generator.setUsingText(mUsingText);
-        String selector = generateCode(generator, mRoot, mTarget, 2, 2);
+        String selector = generateCode(generator, mRoot, mTarget, 2, 2, true);
         if (selector == null)
             return null;
         return generateAction(selector);
     }
 
-    protected String generateCode(UiSelectorGenerator generator, UiObject root, UiObject target, int maxParentLevel, int maxChildrenLevel) {
-        return generateCode(generator, root, target, maxParentLevel, maxChildrenLevel, true);
-    }
 
     protected String generateCode(UiSelectorGenerator generator, UiObject root, UiObject target, int maxParentLevel, int maxChildrenLevel, boolean withFind) {
         String selector;
diff --git a/autojs/src/main/java/com/stardust/autojs/codegeneration/UiSelectorGenerator.java b/autojs/src/main/java/com/stardust/autojs/codegeneration/UiSelectorGenerator.java
index 89f257ed..2c85d687 100644
--- a/autojs/src/main/java/com/stardust/autojs/codegeneration/UiSelectorGenerator.java
+++ b/autojs/src/main/java/com/stardust/autojs/codegeneration/UiSelectorGenerator.java
@@ -6,6 +6,7 @@ import com.stardust.util.Consumer;
 
 import static com.stardust.autojs.codegeneration.CodeGenerator.FIND_ONE;
 import static com.stardust.autojs.codegeneration.CodeGenerator.UNTIL_FIND;
+import static com.stardust.autojs.codegeneration.CodeGenerator.WAIT_FOR;
 
 /**
  * Created by Stardust on 2017/12/7.
@@ -72,7 +73,13 @@ public class UiSelectorGenerator {
         if (selector == null) {
             return null;
         }
-        return selector + (mSearchMode == FIND_ONE ? ".findOne()" : ".untilFind()");
+        if (mSearchMode == FIND_ONE) {
+            return selector + ".findOne()";
+        } else if (mSearchMode == UNTIL_FIND) {
+            return selector + ".untilFind()";
+        } else {
+            return selector.toString();
+        }
     }