diff --git a/src/shared/Modules/CommandPad/MessagesList.h b/src/shared/Modules/CommandPad/MessagesList.h
index f61aba8e8e4bb3128ffaa25056586ad1c5b0136c..f7b715096eba70013ad9d7d6bb72ce74b127751b 100644
--- a/src/shared/Modules/CommandPad/MessagesList.h
+++ b/src/shared/Modules/CommandPad/MessagesList.h
@@ -243,7 +243,7 @@ inline void fillMessagesMap(QMap<QString, MessageFormElement *> &formElements)
 
     element = new MessageFormElement();
     element->addFloat("latitude", "Latitude:", -90, 90, 6);
-    element->addFloat("longitude", "Longitude:", -90, 90, 6);
+    element->addFloat("longitude", "Longitude:", -180, 180, 6);
     formElements["SET_COORDINATES_TC"] = element;
 
     element = new MessageFormElement();
@@ -257,7 +257,7 @@ inline void fillMessagesMap(QMap<QString, MessageFormElement *> &formElements)
 
     element = new MessageFormElement();
     element->addFloat("latitude", "Latitude:", -90, 90, 6);
-    element->addFloat("longitude", "Longitude:", -90, 90, 6);
+    element->addFloat("longitude", "Longitude:", -180, 180, 6);
     formElements["SET_TARGET_COORDINATES_TC"] = element;
 
     element = new MessageFormElement();
@@ -313,13 +313,13 @@ inline void fillMessagesMap(QMap<QString, MessageFormElement *> &formElements)
 
     element = new MessageFormElement();
     element->addFloat("latitude", "Latitude:", -90, 90, 6);
-    element->addFloat("longitude", "Longitude:", -90, 90, 6);
+    element->addFloat("longitude", "Longitude:", -180, 180, 6);
     element->addFloat("height", "Height:", 0, 9999, 6);
     formElements["SET_ANTENNA_COORDINATES_ARP_TC"] = element;
 
     element = new MessageFormElement();
     element->addFloat("latitude", "Latitude:", -90, 90, 6);
-    element->addFloat("longitude", "Longitude:", -90, 90, 6);
+    element->addFloat("longitude", "Longitude:", -180, 180, 6);
     element->addFloat("height", "Height:", 0, 9999, 6);
     formElements["SET_ROCKET_COORDINATES_ARP_TC"] = element;