diff --git a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
index ca168bc49f..060fee241e 100644
--- a/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
+++ b/bitbake/lib/bb/ui/crumbs/imageconfigurationpage.py
@@ -496,17 +496,16 @@ class ImageConfigurationPage (HobPage):
                 cnt = cnt + 1
         self.image_combo.append_text(self.builder.recipe_model.__custom_image__)
 
-        if self.custom_image_selected:
-            self.image_combo.append_text("--Separator--")
-            cnt = cnt + 1
-            self.image_combo.append_text(self.custom_image_selected)
-            if self.custom_image_selected == selected_image:
-                active = cnt
-            cnt = cnt + 1
-
         if selected_image == self.builder.recipe_model.__custom_image__:
             active = cnt
 
+        if self.custom_image_selected:
+            self.image_combo.append_text("--Separator--")
+            self.image_combo.append_text(self.custom_image_selected)
+            cnt = cnt + 2
+            if self.custom_image_selected == selected_image:
+                active = cnt
+
         self.image_combo.set_active(active)
 
         if active != 0: