diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index ce1e2b280..0a5fa61bb 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -1121,17 +1121,6 @@ require_once "resources/require.php";
 	echo "</td>\n";
 	echo "</tr>\n";
 
-	echo "<tr>\n";
-	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
-	echo "	".$text['label-device_vendor']."\n";
-	echo "</td>\n";
-	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='device_vendor' maxlength='255' value=\"$device_vendor\">\n";
-	echo "<br />\n";
-	echo $text['description-device_vendor']."\n";
-	echo "</td>\n";
-	echo "</tr>\n";
-
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-device_uuid_alternate']."\n";
@@ -1152,11 +1141,21 @@ require_once "resources/require.php";
 		echo "	</table>\n";
 		unset($label);
 	}
-
 	echo $text['description-device_uuid_alternate']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-device_vendor']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='device_vendor' maxlength='255' value=\"$device_vendor\">\n";
+	echo "<br />\n";
+	echo $text['description-device_vendor']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-device_model']."\n";