diff --git a/avogadro/qtplugins/forcefield/forcefield.cpp b/avogadro/qtplugins/forcefield/forcefield.cpp
index 285a9e2920..9c40925350 100644
--- a/avogadro/qtplugins/forcefield/forcefield.cpp
+++ b/avogadro/qtplugins/forcefield/forcefield.cpp
@@ -61,16 +61,17 @@ Forcefield::Forcefield(QObject* parent_)
   m_gradientTolerance = settings.value("gradientTolerance", 1.0e-4).toDouble();
   settings.endGroup();
 
+  refreshScripts();
+
   // add the openbabel calculators in case they don't exist
   Calc::EnergyManager::registerModel(new OBMMEnergy("MMFF94"));
   Calc::EnergyManager::registerModel(new OBMMEnergy("UFF"));
   Calc::EnergyManager::registerModel(new OBMMEnergy("GAFF"));
 
-  refreshScripts();
-
   QAction* action = new QAction(this);
   action->setEnabled(true);
-  action->setText(tr("Optimize"));
+  action->setText(tr("Optimize Geometry"));
+  action->setShortcut(QKeySequence("Ctrl+Alt+O"));
   action->setData(optimizeAction);
   action->setProperty("menu priority", 920);
   connect(action, SIGNAL(triggered()), SLOT(optimize()));
diff --git a/avogadro/qtplugins/openbabel/openbabel.cpp b/avogadro/qtplugins/openbabel/openbabel.cpp
index 6abb19b2cc..68b6eb3893 100644
--- a/avogadro/qtplugins/openbabel/openbabel.cpp
+++ b/avogadro/qtplugins/openbabel/openbabel.cpp
@@ -45,7 +45,6 @@ OpenBabel::OpenBabel(QObject* p)
   auto* action = new QAction(this);
   action->setEnabled(true);
   action->setText(tr("Optimize Geometry"));
-  action->setShortcut(QKeySequence("Ctrl+Alt+O"));
   connect(action, SIGNAL(triggered()), SLOT(onOptimizeGeometry()));
   m_actions.push_back(action);