diff --git a/pppc.cc b/pppc.cc
index 59693ee..56ac203 100644
--- a/pppc.cc
+++ b/pppc.cc
@@ -190,11 +190,13 @@ PPPC::PPPC(HINSTANCE hInstance, const char * config_file)
         HMENU submenu = addMenuSubMenu(m_popupMenu,
                                        m_config.entries[i].name.c_str(),
                                        (config_id << 8));
-        addMenuItem(submenu, ConfigEntryCaptions[0], (config_id << 8) | 0x1);
-        addMenuItem(submenu, ConfigEntryCaptions[1], (config_id << 8) | 0x2);
-        addMenuItem(submenu, ConfigEntryCaptions[2], (config_id << 8) | 0x3);
         m_menus.push_back(submenu);
         m_modes.push_back(AUTO);
+        for (int j = 0; j < 3; j++)
+        {
+            addMenuItem(submenu, ConfigEntryCaptions[i],
+                        (config_id << 8) | (j + 1));
+        }
         updateConfigMenus(i);
     }