diff --git a/js/wizardhelper.js b/js/wizardhelper.js
index 261cb4c31..b1fd1b9a3 100644
--- a/js/wizardhelper.js
+++ b/js/wizardhelper.js
@@ -238,7 +238,7 @@ function WizardHelper(sClass, sFormPrefix, sState, sInitialState, sStimulus)
 			}
 			index++;
 		}
-		if(fieldForm!=null){
+		if($('.blockUI').length > 0) {
 			fieldForm.find('button[type=submit]:not(:disabled)').prop("disabled", true).addClass('disabledDuringFieldLoading');
 		}
 		this.AjaxQueryServer();
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index dead51401..f08fea0fa 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -832,7 +832,7 @@ try
 						if (!$oAttDef->IsWritable())
 						{
 							// Even non-writable fields (like AttributeExternal) can be refreshed
-							$sHTMLValue = $oObj->GetAsHTML($sAttCode);
+							$sHTMLValue =  "<div id=\"field_{$sId}\" class=\"field_value_container\"><div class=\"attribute-edit\" data-attcode=\"$sAttCode\">".$oObj->GetAsHTML($sAttCode)."</div></div>";
 						}
 						else
 						{