diff --git a/airtime_mvc/application/views/scripts/form/edit-history-item.phtml b/airtime_mvc/application/views/scripts/form/edit-history-item.phtml
index 219942121..7edbcc8da 100644
--- a/airtime_mvc/application/views/scripts/form/edit-history-item.phtml
+++ b/airtime_mvc/application/views/scripts/form/edit-history-item.phtml
@@ -31,12 +31,14 @@
   </dd>
 <?php endforeach;?>
 
-  <dt>
-    <label for="<?php echo $name;?>"><?php echo _("Choose Show Instance") ?></label>
-  </dt>
-  <dd>
-    <select id="his_instance_select"><option value="0"><?php echo "----------" ?><option></select>
-    <button class="btn" type="button" id="his_instance_retrieve"><?php echo _("Find") ?></button>
+  <dd id="his_choose_instance">
+    <div>
+      <label for="<?php echo $name;?>"><?php echo _("Choose Show Instance") ?></label>
+    </div>
+    <div>
+      <select id="his_instance_select"><option value="0"><?php echo "----------" ?><option></select>
+      <button class="btn" type="button" id="his_instance_retrieve"><?php echo _("Find") ?></button>
+    </div>
   </dd>
 
 <?php foreach ($form->getSubForm('his_item_template') as $index=>$el): ?>
diff --git a/airtime_mvc/public/js/airtime/playouthistory/historytable.js b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
index c37b2e11b..3e7aae7cd 100644
--- a/airtime_mvc/public/js/airtime/playouthistory/historytable.js
+++ b/airtime_mvc/public/js/airtime/playouthistory/historytable.js
@@ -57,7 +57,8 @@ var AIRTIME = (function(AIRTIME) {
     
 		oTableAgg,
 		oTableItem,
-		oTableShow;
+		oTableShow,
+		inShowsTab = false;
     
     function getSelectedLogItems() {
     	var items = Object.keys(selectedLogItems);
@@ -424,6 +425,9 @@ var AIRTIME = (function(AIRTIME) {
     		    	},
     		    	navigate: function() {
     		    		delete fnServerData.instance;
+    		    	},
+    		    	always: function() {
+    		    		inShowsTab = false;
     		    	}
     		    },
     		    {
@@ -433,14 +437,21 @@ var AIRTIME = (function(AIRTIME) {
     		    	},
     		    	navigate: function() {
     		    		delete fnServerData.instance;
+    		    	},
+    		    	always: function() {
+    		    		inShowsTab = false;
     		    	}
     		    },
     		    {
     		    	initialized: false,
     		    	initialize: function() {
-    		    		showSummaryList();
+    		    		
     		    	},
     		    	navigate: function() {
+    		    		
+    		    	},
+    		    	always: function() {
+    		    		inShowsTab = true;
     		    		showSummaryList();
     		    	}
     		    }
@@ -478,6 +489,10 @@ var AIRTIME = (function(AIRTIME) {
     	function makeHistoryDialog(html) {
     		$hisDialogEl = $(html);
     		
+    		if (inShowsTab) {
+    			$hisDialogEl.find("#his_choose_instance").remove();
+    		}
+    		
     		$hisDialogEl.dialog({	       
     	        title: $.i18n._("Edit History Record"),
     	        modal: false,
@@ -649,6 +664,8 @@ var AIRTIME = (function(AIRTIME) {
 				else {
 					tab.navigate();
 				}
+				
+				tab.always();
 			}
     	});