diff --git a/src/etc/inc/system.inc b/src/etc/inc/system.inc
index 41e798eab8..f7987e1d1d 100644
--- a/src/etc/inc/system.inc
+++ b/src/etc/inc/system.inc
@@ -2042,6 +2042,7 @@ function system_dmesg_save() {
 
 function system_set_harddisk_standby() {
 	global $g, $config;
+
 	if (isset($config['system']['developerspew'])) {
 		$mt = microtime();
 		echo "system_set_harddisk_standby() being called $mt\n";
@@ -2055,11 +2056,17 @@ function system_set_harddisk_standby() {
 		$standby = $config['system']['harddiskstandby'];
 		// Check for a numeric value
 		if (is_numeric($standby)) {
-			// Sync the disk(s)
-			pfSense_sync();
-			if (set_single_sysctl('hw.ata.standby', (int)$standby)) {
-				// Reinitialize ATA-drives
-				mwexec('/usr/local/sbin/atareinit');
+			// Get only suitable candidates for standby; using get_smart_drive_list()
+			// from utils.inc to get the list of drives.
+			$harddisks = get_smart_drive_list();
+
+			// Since get_smart_drive_list() only matches ad|da|ada; lets put the check below
+			// just in case of some weird pfSense platform installs.
+			if (count($harddisks) > 0) {
+				// Iterate disks and run the camcontrol command for each
+				foreach ($harddisks as $harddisk) {
+					mwexec("/sbin/camcontrol standby {$harddisk} -t {$standby}");
+				}
 				if (platform_booting()) {
 					echo gettext("done.") . "\n";
 				}
diff --git a/src/usr/local/www/system_advanced_misc.php b/src/usr/local/www/system_advanced_misc.php
index 72f4833436..bd16f1dfd6 100644
--- a/src/usr/local/www/system_advanced_misc.php
+++ b/src/usr/local/www/system_advanced_misc.php
@@ -667,7 +667,7 @@ function tmpvar_checked(obj) {
 							<tr>
 								<td colspan="2" class="list" height="12">&nbsp;</td>
 							</tr>
-							<?php if ($g['platform'] == "pfSenseDISABLED"): ?>
+							<?php if ($g['platform'] == "pfSense"): ?>
 							<tr>
 								<td colspan="2" valign="top" class="listtopic"><?=gettext("Hardware Settings"); ?></td>
 							</tr>