diff --git a/base/cbv/job_role.py b/base/cbv/job_role.py
index 47daded45..8652dd1a5 100644
--- a/base/cbv/job_role.py
+++ b/base/cbv/job_role.py
@@ -92,6 +92,9 @@ class JobRoleFormView(HorillaFormView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         if self.form.instance.pk:
+            self.form.fields["job_position_id"].initial = (
+                self.form.instance.job_position_id
+            )
             self.form_class.verbose_name = _("Update Job Role")
         return context
 
diff --git a/base/forms.py b/base/forms.py
index 261d295c8..d2895e22d 100644
--- a/base/forms.py
+++ b/base/forms.py
@@ -781,15 +781,26 @@ class JobRoleForm(ModelForm):
     JobRole model's form
     """
 
+    job_position_id = forms.ModelMultipleChoiceField(
+        queryset=JobPosition.objects.all(),
+        label="Job Position",
+        widget=forms.SelectMultiple(
+            attrs={
+                "class": "w-100 oh-select",
+                "style": "height:45px;",
+            }
+        ),
+    )
+
     cols = {"job_position_id": 12, "job_role": 12}
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        if not self.instance.pk:
-            job_position_id = forms.ModelMultipleChoiceField(
-                queryset=JobPosition.objects.all(),
+        if self.instance.pk:
+            job_position_id = forms.ModelChoiceField(
+                queryset=self.fields["job_position_id"].queryset,
                 label="Job Position",
-                widget=forms.SelectMultiple(
+                widget=forms.Select(
                     attrs={
                         "class": "w-100 oh-select",
                         "style": "height:45px;",
@@ -804,7 +815,8 @@ class JobRoleForm(ModelForm):
         """
 
         model = JobRole
-        fields = ["job_role", "job_position_id"]
+        fields = "__all__"
+        exclude = ["is_active", "job_position_id", "company_id"]
 
     def clean(self):
         cleaned_data = super().clean()
@@ -822,7 +834,6 @@ class JobRoleForm(ModelForm):
                 raise ValidationError(
                     f"{job_role} already exists under this job position"
                 )
-        cleaned_data.pop("job_position_id", None)
         return cleaned_data
 
     def save(self, commit, *args, **kwargs) -> Any: