diff --git a/CHANGES.md b/CHANGES.md
index f4e48073..1f30a594 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -57,7 +57,6 @@
 * Change refactor properFinder to be part of the search
 * Change improve threading of generic_queue, show_queue and search_queue
 * Change disable the Force buttons on the Manage Searches page while a search is running
-* Change disable the Pause buttons on the Manage Searches page if a search is not running
 * Change staggered periods of testing and updating of all shows "ended" status up to 460 days
 
 [develop changelog]
@@ -73,6 +72,7 @@
 * Removed fixed column widths, this means multiple groups have different column widths, and this original approach is
   preferred because fixed widths look bad with long show titles
 * Add newlines between error log lines on the Logs & Errors page removed as a biproduct of trimming html output
+* Fix Backlog Force buttons were disabled even when only a on-demand backlog was running
 
 
 ### 0.8.3 (2015-04-25 08:48:00 UTC)
diff --git a/gui/slick/interfaces/default/manage_manageSearches.tmpl b/gui/slick/interfaces/default/manage_manageSearches.tmpl
index ad8e75ae..63e08ba2 100644
--- a/gui/slick/interfaces/default/manage_manageSearches.tmpl
+++ b/gui/slick/interfaces/default/manage_manageSearches.tmpl
@@ -19,13 +19,13 @@
 
 	<div id="summary2" class="align-left">
 		<h3>Backlog Search:</h3>
-		<a id="forcebacklog" class="btn#if $backlogRunning# disabled#end if#" href="$sbRoot/manage/manageSearches/forceLimitedBacklog"><i class="sgicon-play"></i> Force Limited</a>
-		<a id="forcefullbacklog" class="btn#if $backlogRunning# disabled#end if#" href="$sbRoot/manage/manageSearches/forceFullBacklog"><i class="sgicon-play"></i> Force Full</a>
-		<a id="pausebacklog" class="btn#if not $backlogRunning# disabled#end if#" href="$sbRoot/manage/manageSearches/pauseBacklog?paused=#if $backlogPaused then "0" else "1"#"><i class="#if $backlogPaused then "sgicon-play" else "sgicon-pause"#"></i> #if $backlogPaused then "Unpause" else "Pause"#</a>
+		<a id="forcebacklog" class="btn#if $standardBacklogRunning# disabled#end if#" href="$sbRoot/manage/manageSearches/forceLimitedBacklog"><i class="sgicon-play"></i> Force Limited</a>
+		<a id="forcefullbacklog" class="btn#if $standardBacklogRunning# disabled#end if#" href="$sbRoot/manage/manageSearches/forceFullBacklog"><i class="sgicon-play"></i> Force Full</a>
+		<a id="pausebacklog" class="btn" href="$sbRoot/manage/manageSearches/pauseBacklog?paused=#if $backlogPaused then "0" else "1"#"><i class="#if $backlogPaused then "sgicon-play" else "sgicon-pause"#"></i> #if $backlogPaused then "Unpause" else "Pause"#</a>
+#if $backlogPaused then 'Paused: ' else ''#
 #if not $backlogRunning:
 		Not in progress<br />
 #else
-	#if $backlogPaused then 'Paused: ' else ''#
 		Currently running ($backlogRunningType)<br />
 #end if
 		<br />
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 676b6303..c7d6739b 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -3225,6 +3225,7 @@ class ManageSearches(Manage):
         # t.backlogPI = sickbeard.backlogSearchScheduler.action.getProgressIndicator()
         t.backlogPaused = sickbeard.searchQueueScheduler.action.is_backlog_paused()
         t.backlogRunning = sickbeard.searchQueueScheduler.action.is_backlog_in_progress()
+        t.standardBacklogRunning = sickbeard.searchQueueScheduler.action.is_standard_backlog_in_progress()
         t.backlogRunningType = sickbeard.searchQueueScheduler.action.type_of_backlog_in_progress()
         t.recentSearchStatus = sickbeard.searchQueueScheduler.action.is_recentsearch_in_progress()
         t.findPropersStatus = sickbeard.searchQueueScheduler.action.is_propersearch_in_progress()