diff --git a/editor/ui/dialogs/content/EdImageProps.js b/editor/ui/dialogs/content/EdImageProps.js
index ad8884d99ec..ad648aa8822 100644
--- a/editor/ui/dialogs/content/EdImageProps.js
+++ b/editor/ui/dialogs/content/EdImageProps.js
@@ -169,14 +169,14 @@ function InitDialog()
                     gInsertNewImage ? null : imageElement,
                     "height", "heightUnitsMenulist", gPixel);
 
+  var rg = gDialog.actualSizeRadio.radioGroup;
   // Set actual radio button if both set values are the same as actual
-  if (actualWidth && actualHeight)
-    gDialog.actualSizeRadio.checked = (width == actualWidth) && (height == actualHeight);
-  else if ( !(width || height) )
-    gDialog.actualSizeRadio.checked = true;
-
-  if (!gDialog.actualSizeRadio.checked)
-    gDialog.customSizeRadio.checked = true;
+  if (actualWidth && actualHeight) {
+    if ((width == actualWidth && height == actualHeight) || !(width || height))
+      rg.selectedItem = gDialog.actualSizeRadio;
+  }
+  if (!gDialog.actualSizeRadio.selected)
+    rg.selectedItem = gDialog.customSizeRadio;
 
   gDialog.widthInput.value  = constrainWidth = width ? width : (actualWidth ? actualWidth : "");
   gDialog.heightInput.value = constrainHeight = height ? height : (actualHeight ? actualHeight : "");
@@ -293,7 +293,7 @@ function PreviewImageLoaded()
       // Use values as start for constrain proportions
     }
 
-    if (gDialog.actualSizeRadio.checked)
+    if (gDialog.actualSizeRadio.selected)
       SetActualSize();
   }
 }
@@ -369,7 +369,7 @@ function ChangeImageSrc()
 
 function doDimensionEnabling()
 {
-  // Enabled only if "Custom" is checked
+  // Enabled only if "Custom" is selected
   var enable = (gDialog.customSizeRadio.selected);
 
   // BUG 74145: After input field is disabled,
@@ -400,7 +400,10 @@ function doOverallEnabling()
 
   wasEnableAll = canEnableOk;
 
-  SetElementEnabledById("ok", canEnableOk );
+  // anon. content, so can't use SetElementEnabledById here
+  var dialogNode = document.getElementById("imageDlg");
+  dialogNode.getButton("accept").disabled = !canEnableOk;
+
   SetElementEnabledById("AdvancedEditButton1", canEnableOk );
   SetElementEnabledById( "imagemapLabel",  canEnableOk );
   //TODO: Restore when Image Map editor is finished
@@ -512,7 +515,7 @@ function ValidateData()
   var width = "";
   var height = "";
 
-  if (!gDialog.actualSizeRadio.checked)
+  if (!gDialog.actualSizeRadio.selected)
   {
     // Get user values for width and height
     width = ValidateNumber(gDialog.widthInput, gDialog.widthUnitsMenulist, 1, maxPixels, 
diff --git a/editor/ui/dialogs/content/EdImageProps.xul b/editor/ui/dialogs/content/EdImageProps.xul
index 418c91492e9..31f2129ebb3 100644
--- a/editor/ui/dialogs/content/EdImageProps.xul
+++ b/editor/ui/dialogs/content/EdImageProps.xul
@@ -34,7 +34,7 @@
 
 
 <!-- dialog containing a control requiring initial setup -->
-<dialog title="&windowTitle.label;"
+<dialog id="imageDlg" title="&windowTitle.label;"
     xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
     onload = "Startup()"
     buttons="accept,cancel,help"
diff --git a/editor/ui/dialogs/content/EdLinkProps.js b/editor/ui/dialogs/content/EdLinkProps.js
index cd891a5f3d7..27339c8b732 100644
--- a/editor/ui/dialogs/content/EdLinkProps.js
+++ b/editor/ui/dialogs/content/EdLinkProps.js
@@ -329,8 +329,11 @@ function doEnabling()
 {
   // We disable Ok button when there's no href text only if inserting a new link
   var enable = insertNew ? (TrimString(gDialog.hrefInput.value).length > 0) : true;
+  
+  // anon. content, so can't use SetElementEnabledById here
+  var dialogNode = document.getElementById("linkDlg");
+  dialogNode.getButton("accept").disabled = !enable;
 
-  SetElementEnabledById( "ok", enable);
   SetElementEnabledById( "AdvancedEditButton1", enable);
 }
 
diff --git a/editor/ui/dialogs/content/EdLinkProps.xul b/editor/ui/dialogs/content/EdLinkProps.xul
index c628ae45a3e..c6f85d7e91b 100644
--- a/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/editor/ui/dialogs/content/EdLinkProps.xul
@@ -30,7 +30,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorLinkProperties.dtd">
 
-<dialog title="&windowTitle.label;"
+<dialog id="linkDlg" title="&windowTitle.label;"
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    buttons="accept,cancel,help"
    onload = "Startup()"