diff --git a/webif/html/js/epg_popup.js b/webif/html/js/epg_popup.js
index 53480f3..5478d09 100644
--- a/webif/html/js/epg_popup.js
+++ b/webif/html/js/epg_popup.js
@@ -22,13 +22,6 @@ function doschedule(type)
 var $buttons1 = {
     "Close" : function() {$(this).dialog('close');}
 };
-var $buttons2 = $.extend(
-    {"Record Programme": function() { doschedule(1) }},
-    {"Set Reminder": function() { doschedule(3) }},
-    $buttons1);
-var $buttons3 = $.extend(
-    {"Record Series": function() { doschedule(2) }},
-    $buttons2);
 
 var $dialog = $('#epgpopup_dialogue').dialog({
 	title: "Programme Details",
@@ -46,17 +39,35 @@ function epgpopup(e, o)
 	e.preventDefault();
 	var sch = o.attr('sch');
 	var rec = o.attr('rec');
-	$dialog.dialog("option", "buttons", $buttons1);
+	var state = o.attr('st');
+
+	var $buttons2 = $.extend(
+      {"Record Series": function() { doschedule(2) }},
+      {"Record Programme": function() { doschedule(1) }},
+      {"Set Reminder": function() { doschedule(3) }},
+      {"Watch Now": function() { doschedule(3) }},
+      $buttons1);      
 
 	if (sch != 0)
 		$buttons = $buttons1;
-	else if (rec == 2)
-		$buttons = $buttons3;
-	else if (rec == 1)
+	else if (rec == 2 || rec == 1)
+    {
 		$buttons = $buttons2;
+		if (rec == 1) delete $buttons["Watch Now"];
+	}
 	else
 		$buttons = $buttons1;
 
+	if (state >= 1) {
+		delete $buttons["Record Programme"];       
+		delete $buttons["Set Reminder"];
+	}
+  	if (state == 0 || state == 2)
+    	delete $buttons["Watch Now"];
+    }
+
+  	$dialog.dialog("option", "buttons", $buttons);
+
 	var url = '/cgi-bin/epg/info.jim?service=' +
 	    o.attr('xs') + '&event=' +
 	    o.attr('xe') + '&bare=1';