diff --git a/ui/scripts/cloud.core.ipaddress.js b/ui/scripts/cloud.core.ipaddress.js
index 183cb9eda56..9fc63adfc1a 100644
--- a/ui/scripts/cloud.core.ipaddress.js
+++ b/ui/scripts/cloud.core.ipaddress.js
@@ -296,7 +296,8 @@ function ipToMidmenu(jsonObj, $midmenuItem1) {
 }
 
 function isIpManageable(domainid, account) {             
-    if((g_domainid == domainid && g_account == account) || (isAdmin() && account!="system")) 
+    if(((g_domainid == domainid && g_account == account) || (g_domainid == domainid && isDomainAdmin()) || (isAdmin())) 
+        && account!="system") 
         return true;
     else
         return false;