diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php
index 0653a9094d..128715ddcd 100644
--- a/app/devices/device_edit.php
+++ b/app/devices/device_edit.php
@@ -933,12 +933,14 @@
 			echo "	<tr>";
 			echo "		<td class='vncell' valign='top'>".$text['label-profile']."</td>";
 			echo "		<td class='vtable' align='left'>";
-			echo "			<select class='formfld' name='device_profile_uuid'>\n";
+			echo "			<select class='formfld' id='device_profile_uuid' name='device_profile_uuid'>\n";
 			echo "				<option value=''></option>\n";
 			foreach($result as $row) {
 				echo "			<option value='".$row['device_profile_uuid']."' ".(($row['device_profile_uuid'] == $device_profile_uuid) ? "selected='selected'" : null).">".$row['device_profile_name']." ".(($row['domain_uuid'] == '') ? "&nbsp;&nbsp;(".$text['select-global'].")" : null)."</option>\n";
 			}
 			echo "			</select>\n";
+			echo "			<button type='button' class='btn btn-default list_control_icon' onclick=\"if(document.getElementById('device_profile_uuid').value != '') window.location='device_profile_edit.php?id='+document.getElementById('device_profile_uuid').value;\"><span class='glyphicon glyphicon-pencil'></span></button>";
+			echo "			<button type='button' class='btn btn-default list_control_icon' onclick=\"window.location='device_profile_edit.php'\"><span class='glyphicon glyphicon-plus'></span></button>";
 			echo "			<br>".$text['description-profile2']."\n";
 			echo "		</td>";
 			echo "	</tr>";