diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index f07f3d9..f80cf5b 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -158,7 +158,15 @@ void MainWindow::on_PM3_connectButton_clicked()
 {
     qDebug() << "Main:" << QThread::currentThread();
 
-    QString port = ui->PM3_portBox->currentData().toString();
+    const QComboBox* portBox = ui->PM3_portBox;
+    QString port;
+    if(portBox->currentText() == portBox->itemText(portBox->currentIndex()))
+        // in the list
+        port = portBox->currentData().toString();
+    else
+        // not in the list
+        port = portBox->currentText();
+    qDebug() << "port:" << port;
     QString startArgs = ui->Set_Client_startArgsEdit->text();
     QString clientPath = ui->PM3_pathBox->currentText();
     QFileInfo clientFile(clientPath);
diff --git a/src/ui/mainwindow.ui b/src/ui/mainwindow.ui
index 967b6e9..2c19ef0 100644
--- a/src/ui/mainwindow.ui
+++ b/src/ui/mainwindow.ui
@@ -94,6 +94,9 @@
         <property name="editable">
          <bool>true</bool>
         </property>
+        <property name="minimumContentsLength">
+         <number>15</number>
+        </property>
        </widget>
       </item>
       <item>