diff --git a/app/common/directives/firmware-list.html b/app/common/directives/firmware-list.html
index 547aa6c..16554d9 100644
--- a/app/common/directives/firmware-list.html
+++ b/app/common/directives/firmware-list.html
@@ -28,8 +28,8 @@
 					     ng-click="!$first && changePriority(firmware.imageId, firmware.Version, firmware.Priority, firmware.Priority - 1)"
 					     ng-show="firmware.activationStatus == 'Functional' || firmware.activationStatus == 'Active'">
 						<span class="accessible-text">firmware up in priority</span></div>
-					<div class="icon icon__down-arrow" aria-hidden="true" ng-class="{'icon-as-spacer':$last || imageList[$index+1].activationStatus != 'Active'}"
-					    ng-click="(!$last && imageList[$index + 1].activationStatus == 'Active') && changePriority(firmware.imageId, firmware.Version, firmware.Priority, firmware.Priority + 2)"
+					<div class="icon icon__down-arrow" aria-hidden="true" ng-class="{'icon-as-spacer':$last || !['Active', 'Functional'].includes(imageList[$index+1].activationStatus)}"
+					    ng-click="(!$last && ['Active', 'Functional'].includes(imageList[$index + 1].activationStatus)) && changePriority(firmware.imageId, firmware.Version, firmware.Priority, firmware.Priority + 2)"
 					    ng-show="firmware.activationStatus == 'Functional' || firmware.activationStatus == 'Active'">
 						<span class="accessible-text">firmware down in priority</span></div>
 				</div>