diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp
index 47b9a03f..16160f17 100644
--- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp
+++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.cpp
@@ -252,7 +252,7 @@ OpenRGBSettingsPage::OpenRGBSettingsPage(QWidget *parent) :
     ui->TextServerHost->setText(QString::fromStdString(autostart_settings["host"]));
     ui->TextServerHost->setEnabled(autostart_settings["setserverhost"]);
 
-    ui->TextServerPort->setText(QString::fromStdString(autostart_settings["port"]));
+    ui->TextServerPort->setValue(QString::fromStdString(autostart_settings["port"]).toInt());
     ui->TextServerPort->setEnabled(autostart_settings["setserverport"]);
 
     ui->TextClientHost->setText(QString::fromStdString(autostart_settings["client"]));
@@ -668,9 +668,9 @@ void OpenRGBSettingsPage::on_TextServerHost_textChanged(QString host)
     SaveAutoStartSetting("host", host);
 }
 
-void OpenRGBSettingsPage::on_TextServerPort_textChanged(QString port)
+void OpenRGBSettingsPage::on_TextServerPort_valueChanged(int port)
 {
-    SaveAutoStartSetting("port", port);
+    SaveAutoStartSetting("port", QString::number(port));
 }
 
 void OpenRGBSettingsPage::on_TextClientHost_textChanged(QString client)
diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h
index 09a9903b..4a2af70f 100644
--- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h
+++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.h
@@ -67,7 +67,7 @@ private slots:
     void on_CheckboxAutoStartClient_clicked();
     void on_CheckboxAutoStartProfile_clicked();
     void on_TextServerHost_textChanged(const QString);
-    void on_TextServerPort_textChanged(const QString);
+    void on_TextServerPort_valueChanged(int);
     void on_TextClientHost_textChanged(const QString);
     void on_TextCustomArgs_textChanged(const QString);
     void on_ComboBoxAutoStartProfile_currentTextChanged(const QString);
diff --git a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui
index 40480247..d256052d 100644
--- a/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui
+++ b/qt/OpenRGBSettingsPage/OpenRGBSettingsPage.ui
@@ -185,19 +185,6 @@
        <item row="32" column="1">
         <widget class="QComboBox" name="ComboBoxResumeProfile"/>
        </item>
-       <item row="27" column="1">
-        <widget class="QLineEdit" name="TextServerPort">
-         <property name="inputMask">
-          <string>90000</string>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="placeholderText">
-          <string/>
-         </property>
-        </widget>
-       </item>
        <item row="4" column="0">
         <widget class="QLabel" name="ThemeLabel">
          <property name="text">
@@ -305,6 +292,19 @@
          </property>
         </widget>
        </item>
+       <item row="27" column="1">
+        <widget class="QSpinBox" name="TextServerPort">
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="maximum">
+          <number>65535</number>
+         </property>
+         <property name="value">
+          <number>6742</number>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>