diff --git a/internal/frontend/qml/PortSettings.qml b/internal/frontend/qml/PortSettings.qml
index 02c7fb0b..7d5ce1e6 100644
--- a/internal/frontend/qml/PortSettings.qml
+++ b/internal/frontend/qml/PortSettings.qml
@@ -135,6 +135,8 @@ SettingsView {
             submitButton.loading = false
             return false
         }
+
+        return true
     }
 
     function submit(){
diff --git a/internal/frontend/qt/frontend_settings.go b/internal/frontend/qt/frontend_settings.go
index d37826b9..5c810962 100644
--- a/internal/frontend/qt/frontend_settings.go
+++ b/internal/frontend/qt/frontend_settings.go
@@ -15,6 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with ProtonMail Bridge.  If not, see <https://www.gnu.org/licenses/>.
 
+//go:build build_qt
 // +build build_qt
 
 package qt
@@ -116,6 +117,7 @@ func (f *FrontendQt) toggleUseSSLforSMTP(makeItEnabled bool) {
 }
 
 func (f *FrontendQt) changePorts(imapPort, smtpPort int) {
+	defer f.qml.ChangePortFinished()
 	f.settings.SetInt(settings.IMAPPortKey, imapPort)
 	f.settings.SetInt(settings.SMTPPortKey, smtpPort)
 	f.restart()