diff --git a/src/panels/lovelace/cards/hui-button-card.ts b/src/panels/lovelace/cards/hui-button-card.ts
index 129390fe5b..2d440a3036 100644
--- a/src/panels/lovelace/cards/hui-button-card.ts
+++ b/src/panels/lovelace/cards/hui-button-card.ts
@@ -149,8 +149,8 @@ export class HuiButtonCard extends LitElement implements LovelaceCard {
 
   public getGridSize(): [number, number] {
     if (
-      (this._config?.show_icon && this._config?.show_name) ||
-      this._config?.show_state
+      this._config?.show_icon &&
+      (this._config?.show_name || this._config?.show_state)
     ) {
       return [2, 2];
     }
diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts
index d90858862d..709a6591d9 100644
--- a/src/panels/lovelace/cards/hui-sensor-card.ts
+++ b/src/panels/lovelace/cards/hui-sensor-card.ts
@@ -72,7 +72,7 @@ class HuiSensorCard extends HuiEntityCard {
     super.setConfig(entityCardConfig);
   }
 
-  public getSize(): [number, number] {
+  public getGridSize(): [number, number] {
     return [2, 2];
   }