diff --git a/indra/llui/llcombobox.cpp b/indra/llui/llcombobox.cpp
index 0b17b9f503..5bfed270c0 100755
--- a/indra/llui/llcombobox.cpp
+++ b/indra/llui/llcombobox.cpp
@@ -537,6 +537,16 @@ void LLComboBox::createLineEditor(const LLComboBox::Params& p)
 	}
 }
 
+// <FS:Ansariel> For setting the focus to the LLLineEditor
+void LLComboBox::focusEditor()
+{
+	if (mTextEntry)
+	{
+		mTextEntry->setFocus(TRUE);
+	}
+}
+// </FS:Ansariel>
+
 void LLComboBox::setLeftTextPadding(S32 pad)
 {
 	S32 left_pad, right_pad;
diff --git a/indra/llui/llcombobox.h b/indra/llui/llcombobox.h
index 4ff66488ec..87f8b2bde6 100755
--- a/indra/llui/llcombobox.h
+++ b/indra/llui/llcombobox.h
@@ -160,6 +160,9 @@ public:
 
 	void			createLineEditor(const Params&);
 
+	// <FS:Ansariel> For setting the focus to the LLLineEditor
+	void			focusEditor();
+
 	//========================================================================
 	LLCtrlSelectionInterface* getSelectionInterface()	{ return (LLCtrlSelectionInterface*)this; };
 	LLCtrlListInterface* getListInterface()				{ return (LLCtrlListInterface*)this; };
diff --git a/indra/newview/fspanellogin.cpp b/indra/newview/fspanellogin.cpp
index 40982a37a0..44929ebdc0 100644
--- a/indra/newview/fspanellogin.cpp
+++ b/indra/newview/fspanellogin.cpp
@@ -402,6 +402,7 @@ void FSPanelLogin::giveFocus()
 		else if (combo)
 		{
 			combo->setFocus(TRUE);
+			combo->focusEditor();
 		}
 	}
 }