diff --git a/src/lib/gui/dialogs/ActionDialog.cpp b/src/lib/gui/dialogs/ActionDialog.cpp
index ccbfc46d0..a4330974d 100644
--- a/src/lib/gui/dialogs/ActionDialog.cpp
+++ b/src/lib/gui/dialogs/ActionDialog.cpp
@@ -51,7 +51,7 @@ ActionDialog::ActionDialog(QWidget *parent, const ServerConfig &config, Hotkey &
 
     ui->listScreens->addItem(newListItem);
 
-    ui->comboSwitchToScreen->addItem(tr("Switch to %1").arg(screen.name()));
+    ui->comboSwitchToScreen->addItem(tr("Switch to %1").arg(screen.name()), screen.name());
     if (screen.name() == m_action.switchScreenName())
       ui->comboSwitchToScreen->setCurrentIndex(ui->comboSwitchToScreen->count() - 1);
   }
@@ -92,7 +92,7 @@ void ActionDialog::accept()
 
   m_action.setHaveScreens(screenCount);
 
-  m_action.setSwitchScreenName(ui->comboSwitchToScreen->currentText().remove(tr("Switch to ")));
+  m_action.setSwitchScreenName(ui->comboSwitchToScreen->currentData().toString());
   m_action.setSwitchDirection(ui->comboSwitchInDirection->currentIndex());
   m_action.setLockCursorMode(ui->comboLockCursorToScreen->currentIndex());
   m_action.setActiveOnRelease(ui->comboTriggerOn->currentIndex());
diff --git a/translations/deskflow_es.ts b/translations/deskflow_es.ts
index f4d9e94c4..69bd87bd7 100644
--- a/translations/deskflow_es.ts
+++ b/translations/deskflow_es.ts
@@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
         <source>Switch to %1</source>
         <translation type="unfinished">Cambiar a %1</translation>
     </message>
-    <message>
-        <source>Switch to </source>
-        <translation type="unfinished">Cambiar a </translation>
-    </message>
 </context>
 <context>
     <name>ClientConfigDialog</name>
diff --git a/translations/deskflow_it.ts b/translations/deskflow_it.ts
index 7620a3856..06fbf960c 100644
--- a/translations/deskflow_it.ts
+++ b/translations/deskflow_it.ts
@@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
         <source>Switch to %1</source>
         <translation>Passa a %1</translation>
     </message>
-    <message>
-        <source>Switch to </source>
-        <translation>Passa a </translation>
-    </message>
 </context>
 <context>
     <name>ClientConfigDialog</name>
diff --git a/translations/deskflow_ja.ts b/translations/deskflow_ja.ts
index decc3c314..87591d3bd 100644
--- a/translations/deskflow_ja.ts
+++ b/translations/deskflow_ja.ts
@@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
         <source>Switch to %1</source>
         <translation>%1 に切り替える</translation>
     </message>
-    <message>
-        <source>Switch to </source>
-        <translation>に切り替える</translation>
-    </message>
 </context>
 <context>
     <name>ClientConfigDialog</name>
diff --git a/translations/deskflow_ko.ts b/translations/deskflow_ko.ts
index b1e1bdecf..13f2320c6 100644
--- a/translations/deskflow_ko.ts
+++ b/translations/deskflow_ko.ts
@@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
         <source>Switch to %1</source>
         <translation>%1(으)로 전환</translation>
     </message>
-    <message>
-        <source>Switch to </source>
-        <translation>전환: </translation>
-    </message>
 </context>
 <context>
     <name>ClientConfigDialog</name>
diff --git a/translations/deskflow_ru.ts b/translations/deskflow_ru.ts
index de4223837..5488b6bdb 100644
--- a/translations/deskflow_ru.ts
+++ b/translations/deskflow_ru.ts
@@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
         <source>Switch to %1</source>
         <translation>Переключиться на %1</translation>
     </message>
-    <message>
-        <source>Switch to </source>
-        <translation>Переключиться на </translation>
-    </message>
 </context>
 <context>
     <name>ClientConfigDialog</name>
diff --git a/translations/deskflow_zh_CN.ts b/translations/deskflow_zh_CN.ts
index 30a3384a8..781f818d1 100644
--- a/translations/deskflow_zh_CN.ts
+++ b/translations/deskflow_zh_CN.ts
@@ -134,10 +134,6 @@ p, li { white-space: pre-wrap; }
         <source>Switch to %1</source>
         <translation>切换到 %1</translation>
     </message>
-    <message>
-        <source>Switch to </source>
-        <translation>切换到 </translation>
-    </message>
 </context>
 <context>
     <name>ClientConfigDialog</name>