diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 61a803f6ab..903a9009ab 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -1689,7 +1689,7 @@
 
 				echo "<input type='hidden' id='key_vendor_".$x."' name='device_keys[".$x."][device_key_vendor]' value=\"".$device_key_vendor."\" />\n";
 
-				echo "<select class='formfld' name='device_keys[".$x."][device_key_type]' id='key_type_".$x."'>\n";
+				echo "<select class='formfld' name='device_keys[".$x."][device_key_type]' id='key_type_".$x."' ".(empty($device_key_vendor) ? "onchange=\"document.getElementById('key_vendor_".$x."').value = this.options[this.selectedIndex].getAttribute('vendor');\"" : null).">\n";
 				echo "	<option value=''></option>\n";
 				$previous_vendor = '';
 				$i=0;