diff --git a/src/celestia/gtk/menu-context.cpp b/src/celestia/gtk/menu-context.cpp
index 91449e97..c20b7d8f 100644
--- a/src/celestia/gtk/menu-context.cpp
+++ b/src/celestia/gtk/menu-context.cpp
@@ -312,7 +312,9 @@ static GtkMenu* CreatePlanetarySystemMenu(string parentName, const PlanetarySyst
     vector<IntStrPair> comets;
     vector<IntStrPair> invisibles;
     vector<IntStrPair> moons;
+    vector<IntStrPair> minorMoons;
     vector<IntStrPair> planets;
+    vector<IntStrPair> dwarfPlanets;
     vector<IntStrPair> spacecraft;
 
     /* We will use these objects to iterate over all the above vectors */
@@ -338,9 +340,15 @@ static GtkMenu* CreatePlanetarySystemMenu(string parentName, const PlanetarySyst
             case Body::Moon:
                 moons.push_back(make_pair(i, body->getName()));
                 break;
+            case Body::MinorMoon:
+                minorMoons.push_back(make_pair(i, body->getName()));
+                break;
             case Body::Planet:
                 planets.push_back(make_pair(i, body->getName()));
                 break;
+            case Body::DwarfPlanet:
+                dwarfPlanets.push_back(make_pair(i, body->getName()));
+                break;
             case Body::Spacecraft:
                 spacecraft.push_back(make_pair(i, body->getName()));
                 break;
@@ -356,8 +364,12 @@ static GtkMenu* CreatePlanetarySystemMenu(string parentName, const PlanetarySyst
     menuNames.push_back("Invisibles");
     objects.push_back(moons);
     menuNames.push_back("Moons");
+    objects.push_back(minorMoons);
+    menuNames.push_back("Minor moons");
     objects.push_back(planets);
     menuNames.push_back("Planets");
+    objects.push_back(dwarfPlanets);
+    menuNames.push_back("Dwarf planets");
     objects.push_back(spacecraft);
     menuNames.push_back("Spacecraft");
 
diff --git a/src/celestia/qt/qtselectionpopup.cpp b/src/celestia/qt/qtselectionpopup.cpp
index 50760aa5..7ab24e68 100644
--- a/src/celestia/qt/qtselectionpopup.cpp
+++ b/src/celestia/qt/qtselectionpopup.cpp
@@ -385,9 +385,15 @@ QMenu* SelectionPopup::createObjectMenu(PlanetarySystem* sys,
                     case Body::Planet:
                         title = _("Planets");
                         break;
+                    case Body::DwarfPlanet:
+                        title = _("Dwarf planets");
+                        break;
                     case Body::Moon:
                         title = _("Moons");
                         break;
+                    case Body::MinorMoon:
+                        title = _("Minor moons");
+                        break;
                     case Body::Asteroid:
                         title = _("Asteroids");
                         break;
@@ -423,10 +429,18 @@ void SelectionPopup::addObjectMenus(PlanetarySystem* sys)
     if (planetsMenu != nullptr)
         addMenu(planetsMenu);
 
+    QMenu* dwarfPlanetsMenu = createObjectMenu(sys, Body::DwarfPlanet);
+    if (dwarfPlanetsMenu != nullptr)
+        addMenu(dwarfPlanetsMenu);
+
     QMenu* moonsMenu = createObjectMenu(sys, Body::Moon);
     if (moonsMenu != nullptr)
         addMenu(moonsMenu);
 
+    QMenu* minorMoonsMenu = createObjectMenu(sys, Body::MinorMoon);
+    if (minorMoonsMenu != nullptr)
+        addMenu(minorMoonsMenu);
+
     QMenu* asteroidsMenu = createObjectMenu(sys, Body::Asteroid);
     if (asteroidsMenu != nullptr)
         addMenu(asteroidsMenu);