diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js
index e4a87dddfcc6..d07409304302 100644
--- a/ui/scripts/ui-custom/affinity.js
+++ b/ui/scripts/ui-custom/affinity.js
@@ -136,8 +136,8 @@
                         });
                     }
                 }]
-            }).parent('.ui-dialog').overlay();
-
+            });
+            cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton($dataList);
             // Add tier select dialog
             if (tierSelect) {
                 var $toolbar = $dataList.find('.toolbar');