diff --git a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
index 9dade3b58be4219499405025d8f65576cfad7555..181c4aad440757467139b728acfc6ceeb4af71d1 100644
--- a/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
+++ b/source/RobotAPI/gui-plugins/KinematicUnitPlugin/KinematicUnitGuiPlugin.cpp
@@ -155,7 +155,7 @@ void KinematicUnitWidgetController::onConnectComponent()
         packages.push_back(Application::GetProjectName());
         ARMARX_VERBOSE << "ArmarX packages " << packages;
 
-        for (const std::string & projectName : packages)
+        for (const std::string& projectName : packages)
         {
             if (projectName.empty())
             {
@@ -596,9 +596,6 @@ bool KinematicUnitWidgetController::initGUIComboBox(VirtualRobot::RobotNodeSetPt
             ui.nodeListComboBox->addItem(name);
         }
 
-        selectJoint(0);
-        ui.nodeListComboBox->setCurrentIndex(0);
-
         return true;
     }
 
@@ -839,14 +836,14 @@ void KinematicUnitWidgetController::updateControlModesTable()
 
             switch (currentMode)
             {
-                    /*case eNoMode:
-                        state = "None";
-                        break;
-
-                    case eUnknownMode:
-                        state = "Unknown";
-                        break;
-                    */
+                /*case eNoMode:
+                    state = "None";
+                    break;
+
+                case eUnknownMode:
+                    state = "Unknown";
+                    break;
+                */
                 case eDisabled:
                     state = "Disabled";
                     break;
@@ -1177,7 +1174,7 @@ void KinematicUnitWidgetController::reportControlModeChanged(const NameControlMo
     //        return;
     boost::recursive_mutex::scoped_lock lock(mutexNodeSet);
 
-    for (auto & e : jointModes)
+    for (auto& e : jointModes)
     {
         //        ARMARX_INFO << "Setting jointMode of joint " << e.first << " to " << e.second;