diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index 5d2c7fb53..7ab20a236 100644
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -114,6 +114,9 @@ void GEOMBase_Skeleton::ClickOnCancel()
 //=================================================================================
 void GEOMBase_Skeleton::LineEditReturnPressed()
 {
+  if ( !myEditCurrentArgument )
+    return;
+
   /* User name of object input management                          */
   /* If successfull the selection is changed and signal emitted... */
   /* so SelectionIntoArgument() is automatically called.           */
diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
index cc1fb4f54..1e185d107 100755
--- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
+++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx
@@ -385,6 +385,7 @@ void RepairGUI_ShapeProcessDlg::selectionChanged()
 //=================================================================================
 void RepairGUI_ShapeProcessDlg::selectClicked()
 {
+  myEditCurrentArgument = mySelectWdgt->LineEdit1;
   mySelectWdgt->LineEdit1->setFocus();
   selectionChanged();
 }