diff --git a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
index 213ae0f792..7bdf81b1d8 100644
--- a/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
+++ b/frontend/src/business/components/api/definition/components/ApiVariableAdvance.vue
@@ -3,6 +3,7 @@
              :visible.sync="itemValueVisible"
              :append-to-body="appendToBody"
              :fullscreen="dialogVisible"
+             :modal="false"
              class="advanced-item-value"
              width="100%">
 
diff --git a/frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue b/frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue
index 1638f624f3..9d39ff0525 100644
--- a/frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue
+++ b/frontend/src/business/components/common/json-schema/schema/editor/mock/MockComplete.vue
@@ -12,18 +12,18 @@
       @select="change">
       <i slot="suffix" class="el-input__icon el-icon-edit pointer" @click="advanced(mock)"></i>
     </el-autocomplete>
+    <ms-api-variable-advance :scenario-definition="scenarioDefinition" :current-item="mock" ref="variableAdvance"/>
 
-    <ms-advance ref="variableAdvance" :current-item="mock"/>
   </div>
 </template>
 
 <script>
   import {JMETER_FUNC, MOCKJS_FUNC} from "@/common/js/constants";
-  import MsAdvance from "./Advance";
+  import MsApiVariableAdvance from "../../../../../api/definition/components/ApiVariableAdvance";
 
   export default {
     name: 'MsMock',
-    components: {MsAdvance},
+    components: {MsApiVariableAdvance},
     props: {
       schema: {
         type: Object,