diff --git a/app/src/main/java/com/example/attendancemgr/enrolActivity.java b/app/src/main/java/com/example/attendancemgr/enrolActivity.java
index 46d3f7e..f1eff86 100644
--- a/app/src/main/java/com/example/attendancemgr/enrolActivity.java
+++ b/app/src/main/java/com/example/attendancemgr/enrolActivity.java
@@ -61,6 +61,7 @@ public class enrolActivity extends AppCompatActivity {
 private final String ADD = "Add courses";
 private final String NEW = "new enrollment";
 private Toolbar mToolbar;
+private String selectedDept = NO_DATA;
 private byte[] IDCardbytes;
 private List<String> coursesList;
 
@@ -165,6 +166,10 @@ public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l)
                         deptSpinnerAdapter.add("Select Department");
                         deptSpinnerAdapter.addAll(deptsSet);
                         deptSpinnerAdapter.notifyDataSetChanged();
+                        int position = deptSpinnerAdapter.getPosition(selectedDept);
+                        if (!selectedDept.equals(NO_DATA) && position > 0) {
+                            deptSpinner.setSelection(position);
+                        }
 
                     }
 
@@ -219,11 +224,7 @@ public void onNothingSelected(AdapterView<?> parent) {
 
             }
         });
-            String[] spinnerData = getSpinnerData();
-            if (!spinnerData[1].equals(NO_DATA)){
-                facultySpinner.setSelection(facSpinnerAdapter.getPosition(spinnerData[0]));
-                deptSpinner.setSelection(deptSpinnerAdapter.getPosition(spinnerData[1]));
-            }
+
 
         allCoursesLiveData.observe(this, agentCourses -> {
             allCourses = agentCourses;
@@ -265,7 +266,11 @@ public void onNothingSelected(AdapterView<?> parent) {
             if (!statusView.getText().toString().isEmpty()) {statusView.setText(""); return true;}
             return false;
         });*/
-
+        String[] spinnerData = getSpinnerData();
+        if (!spinnerData[1].equals(NO_DATA)){
+            facultySpinner.setSelection(facSpinnerAdapter.getPosition(spinnerData[0]));
+            selectedDept = spinnerData[0];
+        }
         mToolbar.setOnMenuItemClickListener(onMenuItemClick);
 
     }