diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
index 03dcf98346..9bbf0abd28 100644
--- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
+++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/datatables/datatables-extensions.js
@@ -84,12 +84,9 @@ var abp = abp || {};
         };
 
         var _createButtonDropdown = function (record, field, tableInstance) {
-            if (field.items.length === 1) {
+            if (field.items.length === 1 && getVisibilityValue(field.items[0].visible, record, tableInstance)) {
                 var firstItem = field.items[0];
-                if (!getVisibilityValue(firstItem.visible, record, tableInstance)) {
-                    return $('');
-                }
-
+                
                 var $button = $('<button type="button" class="btn btn-primary btn-sm abp-action-button"></button>');
 
                 if (firstItem.displayNameHtml) {
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/EntityActions.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/EntityActions.razor
index d68dcb82ca..cd1f908dcc 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/EntityActions.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/EntityActions.razor
@@ -1,6 +1,6 @@
 @typeparam TItem
 <CascadingValue Value="this" IsFixed="true">
-    @if ( Type == ActionType.Dropdown )
+    @if ( Type == ActionType.Dropdown || (Type == ActionType.Button && DisabledOrNoActions()))
     {
         <Dropdown Disabled="@DisabledOrNoActions()">
             <Tooltip Text="@(DisabledOrNoActions() ? UiLocalizer["EntityActionsDisabledTooltip"] : string.Empty)">