diff --git a/src/Gui/propertyeditor/PropertyItemDelegate.cpp b/src/Gui/propertyeditor/PropertyItemDelegate.cpp
index 2b79de29c..2aa58bffb 100644
--- a/src/Gui/propertyeditor/PropertyItemDelegate.cpp
+++ b/src/Gui/propertyeditor/PropertyItemDelegate.cpp
@@ -101,6 +101,8 @@ QWidget * PropertyItemDelegate::createEditor (QWidget * parent, const QStyleOpti
     QWidget* editor = childItem->createEditor(parent, this, SLOT(valueChanged()));
     if (editor && childItem->isReadOnly())
         editor->setDisabled(true);
+    else if (editor)
+        editor->setFocus();
     return editor;
 }