diff --git a/backend/pyproject.toml b/backend/pyproject.toml
index c5a531f..0257194 100644
--- a/backend/pyproject.toml
+++ b/backend/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "hekshermgmt"
-version = "0.1.1"
+version = "0.1.2"
 description = ""
 authors = ["Aviram Hassan <aviram.hassan@biocatch.com>"]
 
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index f9fa1bf..e322cdb 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "hekshermgmt",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/frontend/package.json b/frontend/package.json
index 36cc307..3cf321a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hekshermgmt",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/frontend/src/components/EditRuleDialog.vue b/frontend/src/components/EditRuleDialog.vue
index 1d69a78..a32d485 100644
--- a/frontend/src/components/EditRuleDialog.vue
+++ b/frontend/src/components/EditRuleDialog.vue
@@ -1,27 +1,27 @@
 <template>
-  <v-dialog v-model="show" width="50%">
+  <v-dialog v-model="show" width="50%" @focusin.prevent :retain-focus="false">
     <v-card>
       <v-card-title>
-        <span class="headline">Edit Setting - {{ setting.name }}, Rule - {{ rule.rule_id }}</span>
+        <span class="headline">Edit Setting - {{ setting_.name }}, Rule - {{ rule_.rule_id }}</span>
       </v-card-title>
       <v-card-text>
         <v-form ref="form" v-model="valid">
           <v-container class="d-flex flex-column">
             <v-container class="d-flex">
               <v-text-field
-                  outlined readonly :label="context" v-for="context in setting.configurable_features" :key="context"
+                  outlined readonly :label="context" v-for="context in setting_.configurable_features" :key="context"
                   :value="changedRule['context_features'][context] || ' '" class="ml-1 mr-1"
               />
             </v-container>
-            <rule-value v-model="changedRule.value" :setting-type="setting.type"
-                        :initial-value="rule.value" :default-value="setting.default_value"/>
+            <rule-value v-model="changedRule.value" :setting-type="setting_.type"
+                        :initial-value="rule_.value" :default-value="setting_.default_value" ref="rule_value"/>
             <v-text-field readonly label="Information" :value="changedRule.information || ' '" outlined/>
           </v-container>
         </v-form>
       </v-card-text>
       <v-card-actions>
         <v-spacer></v-spacer>
-        <v-btn color="blue" text @click.prevent="show=false">
+        <v-btn color="blue" text @click.prevent="closeDialog()" @focusin.stop>
           Cancel
         </v-btn>
         <v-btn color="blue" text @click="saveRule">
@@ -40,13 +40,17 @@ export default {
     RuleValue
   },
   methods: {
+    async closeDialog() {
+      this.show = false;
+      this.$refs.rule_value.resetValue()
+    },
     async saveRule() {
       this.$refs.form.validate();
       if (!this.valid) {
         return;
       }
       var new_value = this.changedRule.value
-      if (this.setting.type.startsWith("Sequence") || this.setting.type.startsWith("Mapping")) {
+      if (this.setting_.type.startsWith("Sequence") || this.setting_.type.startsWith("Mapping")) {
         try {
           new_value = JSON.parse(this.changedRule.value);
         } catch (err) {
@@ -55,7 +59,7 @@ export default {
         }
       }
       try {
-        await this.$http.patch(`/api/v1/rule/${this.rule.rule_id}`, {
+        await this.$http.patch(`/api/v1/rule/${this.rule_.rule_id}`, {
           'value': new_value
         });
       } catch (error) {
@@ -66,7 +70,14 @@ export default {
       this.show = false;
     },
     initializeRuleObject() {
-      return JSON.parse(JSON.stringify(this.rule));
+      return JSON.parse(JSON.stringify(this.rule_));
+    },
+    selectRule(setting, rule) {
+      this.setting_ = setting
+      this.rule_ = rule
+      this.changedRule = JSON.parse(JSON.stringify(rule));
+      this.valid = true
+      this.newRuleDialog = false
     }
   },
   computed: {
@@ -82,6 +93,8 @@ export default {
   props: ['setting', 'rule', 'value'],
   data() {
     return {
+      setting_: this.setting,
+      rule_: this.rule,
       changedRule: this.initializeRuleObject(),
       newRuleDialog: false,
       valid: true,
diff --git a/frontend/src/components/SettingRules.vue b/frontend/src/components/SettingRules.vue
index d423df8..b3cbe2c 100644
--- a/frontend/src/components/SettingRules.vue
+++ b/frontend/src/components/SettingRules.vue
@@ -19,10 +19,10 @@
     </v-card>
     <v-data-table :headers="headers" :items="rules" :search="search" multi-sort>
         <template v-slot:item.actions="{ item }">
-          <v-icon small @click.prevent="editRuleDialog=true">
+          <v-icon small @click="editRule(setting, item)">
                 mdi-pencil
           </v-icon>
-          <edit-rule-dialog v-on:rule-saved="onRuleChange" v-model="editRuleDialog" :setting="setting" :rule="item"/>
+          <EditRuleDialog v-on:rule-saved="onRuleChange" v-model="editRuleDialog" :setting="setting" :rule="item" ref="edit"/>
           <v-spacer/>
             <v-icon small @click="deleteConfirmDialog(item)">
                 mdi-delete
@@ -80,6 +80,10 @@ export default {
                 return;
             }
             this.rules = response.data;
+        },
+        editRule(setting, rule) {
+          this.$refs.edit.selectRule(setting, rule);
+          this.editRuleDialog = true
         }
     },
     computed: {