diff --git a/src/panels/calendar/ha-panel-calendar.ts b/src/panels/calendar/ha-panel-calendar.ts
index 4e60d13eea..0e4547fc07 100644
--- a/src/panels/calendar/ha-panel-calendar.ts
+++ b/src/panels/calendar/ha-panel-calendar.ts
@@ -147,11 +147,18 @@ class PanelCalendar extends LitElement {
                 ></ha-svg-icon>
               </ha-button>
               ${calendarItems}
-              <li divider role="separator"></li>
-              <ha-list-item graphic="icon" @click=${this._addCalendar}>
-                <ha-svg-icon .path=${mdiPlus} slot="graphic"></ha-svg-icon>
-                ${this.hass.localize("ui.components.calendar.create_calendar")}
-              </ha-list-item>
+              ${this.hass.user?.is_admin
+                ? html` <li divider role="separator"></li>
+                    <ha-list-item graphic="icon" @click=${this._addCalendar}>
+                      <ha-svg-icon
+                        .path=${mdiPlus}
+                        slot="graphic"
+                      ></ha-svg-icon>
+                      ${this.hass.localize(
+                        "ui.components.calendar.create_calendar"
+                      )}
+                    </ha-list-item>`
+                : nothing}
             </ha-button-menu>`
           : html`<div slot="title">
               ${this.hass.localize("ui.components.calendar.my_calendars")}
@@ -162,7 +169,7 @@ class PanelCalendar extends LitElement {
           .label=${this.hass.localize("ui.common.refresh")}
           @click=${this._handleRefresh}
         ></ha-icon-button>
-        ${showPane
+        ${showPane && this.hass.user?.is_admin
           ? html`<mwc-list slot="pane" multi}>${calendarItems}</mwc-list>
               <ha-list-item
                 graphic="icon"
diff --git a/src/panels/todo/ha-panel-todo.ts b/src/panels/todo/ha-panel-todo.ts
index 0023cf105b..ff11111889 100644
--- a/src/panels/todo/ha-panel-todo.ts
+++ b/src/panels/todo/ha-panel-todo.ts
@@ -204,19 +204,30 @@ class PanelTodo extends LitElement {
                   ></ha-svg-icon>
                 </ha-button>
                 ${listItems}
-                <li divider role="separator"></li>
-                <ha-list-item graphic="icon" @click=${this._addList}>
-                  <ha-svg-icon .path=${mdiPlus} slot="graphic"></ha-svg-icon>
-                  ${this.hass.localize("ui.panel.todo.create_list")}
-                </ha-list-item>
+                ${this.hass.user?.is_admin
+                  ? html`<li divider role="separator"></li>
+                      <ha-list-item graphic="icon" @click=${this._addList}>
+                        <ha-svg-icon
+                          .path=${mdiPlus}
+                          slot="graphic"
+                        ></ha-svg-icon>
+                        ${this.hass.localize("ui.panel.todo.create_list")}
+                      </ha-list-item>`
+                  : nothing}
               </ha-button-menu>`
             : this.hass.localize("panel.todo")}
         </div>
         <mwc-list slot="pane" activatable>${listItems}</mwc-list>
-        <ha-list-item graphic="icon" slot="pane-footer" @click=${this._addList}>
-          <ha-svg-icon .path=${mdiPlus} slot="graphic"></ha-svg-icon>
-          ${this.hass.localize("ui.panel.todo.create_list")}
-        </ha-list-item>
+        ${showPane && this.hass.user?.is_admin
+          ? html`<ha-list-item
+              graphic="icon"
+              slot="pane-footer"
+              @click=${this._addList}
+            >
+              <ha-svg-icon .path=${mdiPlus} slot="graphic"></ha-svg-icon>
+              ${this.hass.localize("ui.panel.todo.create_list")}
+            </ha-list-item>`
+          : nothing}
         <ha-button-menu slot="actionItems">
           <ha-icon-button
             slot="trigger"