diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt
index 65bee8c9f..c33250557 100644
--- a/application/CMakeLists.txt
+++ b/application/CMakeLists.txt
@@ -200,6 +200,8 @@ SET(MULTIMC_SOURCES
 	# GUI - widgets
 	widgets/Common.cpp
 	widgets/Common.h
+	widgets/FocusLineEdit.cpp
+	widgets/FocusLineEdit.h
 	widgets/IconLabel.cpp
 	widgets/IconLabel.h
 	widgets/LabeledToolButton.cpp
diff --git a/application/dialogs/NewInstanceDialog.ui b/application/dialogs/NewInstanceDialog.ui
index f9d59a56b..6b875ff46 100644
--- a/application/dialogs/NewInstanceDialog.ui
+++ b/application/dialogs/NewInstanceDialog.ui
@@ -9,7 +9,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>277</width>
+    <width>281</width>
     <height>404</height>
    </rect>
   </property>
@@ -118,7 +118,7 @@
       </widget>
      </item>
      <item row="4" column="0" colspan="2">
-      <widget class="QLineEdit" name="modpackEdit">
+      <widget class="FocusLineEdit" name="modpackEdit">
        <property name="enabled">
         <bool>false</bool>
        </property>
@@ -192,6 +192,13 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>FocusLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>widgets/FocusLineEdit.h</header>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>instNameTextBox</tabstop>
   <tabstop>groupBox</tabstop>
diff --git a/application/widgets/FocusLineEdit.cpp b/application/widgets/FocusLineEdit.cpp
new file mode 100644
index 000000000..139126c80
--- /dev/null
+++ b/application/widgets/FocusLineEdit.cpp
@@ -0,0 +1,25 @@
+#include "FocusLineEdit.h"
+#include <QDebug>
+
+FocusLineEdit::FocusLineEdit(QWidget *parent) : QLineEdit(parent)
+{
+	_selectOnMousePress = false;
+}
+
+void FocusLineEdit::focusInEvent(QFocusEvent *e)
+{
+	QLineEdit::focusInEvent(e);
+	selectAll();
+	_selectOnMousePress = true;
+}
+
+void FocusLineEdit::mousePressEvent(QMouseEvent *me)
+{
+	QLineEdit::mousePressEvent(me);
+	if (_selectOnMousePress)
+	{
+		selectAll();
+		_selectOnMousePress = false;
+	}
+	qDebug() << selectedText();
+}
diff --git a/application/widgets/FocusLineEdit.h b/application/widgets/FocusLineEdit.h
new file mode 100644
index 000000000..6d1c78a87
--- /dev/null
+++ b/application/widgets/FocusLineEdit.h
@@ -0,0 +1,17 @@
+#include <QLineEdit>
+
+class FocusLineEdit : public QLineEdit
+{
+	Q_OBJECT
+public:
+	FocusLineEdit(QWidget *parent);
+	virtual ~FocusLineEdit()
+	{
+	}
+
+protected:
+	void focusInEvent(QFocusEvent *e);
+	void mousePressEvent(QMouseEvent *me);
+
+	bool _selectOnMousePress;
+};