diff --git a/javascript/ui.js b/javascript/ui.js
index 547ddf0a..5df3207f 100644
--- a/javascript/ui.js
+++ b/javascript/ui.js
@@ -851,6 +851,20 @@ onUiUpdate(function(){
 	
 	tabsHiddenChange();
 	
+	gradioApp().querySelectorAll('[id^="image_buttons_"] button, #png_2img_results button').forEach(function (elem){
+
+		if(elem.id == "txt2img_tab"){
+			elem.setAttribute("tab-id", 0);
+			elem.addEventListener('click', navTabClicked);
+		}else if(elem.id == "img2img_tab" || elem.id == "inpaint_tab"){
+			elem.setAttribute("tab-id", 1);
+			elem.addEventListener('click', navTabClicked);
+		}if(elem.id == "extras_tab"){
+			elem.setAttribute("tab-id", 2);
+			elem.addEventListener('click', navTabClicked);
+		}		
+	})
+	
 	// add - remove quicksettings
 	const settings_submit = gradioApp().querySelector('#settings_submit');
 	const quick_parent = gradioApp().querySelector("#quicksettings_overflow_container");