2 files changed, 24 insertions, 14 deletions

diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 5ad43b0e..4ace6204 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -492,6 +492,7 @@ int font_LabelWidget(const iLabelWidget *d) {
 }
 
 void updateSize_LabelWidget(iLabelWidget *d) {
+    if (!d) return;
     iWidget      *w     = as_Widget(d);
     const int64_t flags = flags_Widget(w);
     const iInt2   size  = defaultSize_LabelWidget(d);
@@ -562,18 +563,22 @@ void setTextColor_LabelWidget(iLabelWidget *d, int color) {
 }
 
 void setText_LabelWidget(iLabelWidget *d, const iString *text) {
-    updateText_LabelWidget(d, text);
-    updateSize_LabelWidget(d);
-    if (isWrapped_LabelWidget(d)) {
-        sizeChanged_LabelWidget_(d);
+    if (d) {
+        updateText_LabelWidget(d, text);
+        updateSize_LabelWidget(d);
+        if (isWrapped_LabelWidget(d)) {
+            sizeChanged_LabelWidget_(d);
+        }
     }
 }
 
 void setTextCStr_LabelWidget(iLabelWidget *d, const char *text) {
-    updateTextCStr_LabelWidget(d, text);
-    updateSize_LabelWidget(d);
-    if (isWrapped_LabelWidget(d)) {
-        sizeChanged_LabelWidget_(d);
+    if (d) {
+        updateTextCStr_LabelWidget(d, text);
+        updateSize_LabelWidget(d);
+        if (isWrapped_LabelWidget(d)) {
+            sizeChanged_LabelWidget_(d);
+        }
     }
 }
 
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index fa0e16ea..07f1908c 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -251,12 +251,14 @@ static iBool isSlidingSheet_SidebarWidget_(const iSidebarWidget *d) {
 static void setMobileEditMode_SidebarWidget_(iSidebarWidget *d, iBool editing) {
     iWidget *w = as_Widget(d);
     d->isEditing = editing;
-    setFlags_Widget(findChild_Widget(w, "sidebar.close"), hidden_WidgetFlag, editing);
-    setFlags_Widget(child_Widget(d->actions, 0), hidden_WidgetFlag, !editing);
-    setTextCStr_LabelWidget(child_Widget(as_Widget(d->actions), 2),
-                            editing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}");
-    setDragHandleWidth_ListWidget(d->list, editing ? itemHeight_ListWidget(d->list) * 3 / 2 : 0);
-    arrange_Widget(d->actions);
+    if (d->actions) {
+        setFlags_Widget(findChild_Widget(w, "sidebar.close"), hidden_WidgetFlag, editing);
+        setFlags_Widget(child_Widget(d->actions, 0), hidden_WidgetFlag, !editing);
+        setTextCStr_LabelWidget(child_Widget(as_Widget(d->actions), 2),
+                                editing ? "${sidebar.close}" : "${sidebar.action.bookmarks.edit}");
+        setDragHandleWidth_ListWidget(d->list, editing ? itemHeight_ListWidget(d->list) * 3 / 2 : 0);
+        arrange_Widget(d->actions);
+    }
 }
 
 static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepActions) {
@@ -698,6 +700,9 @@ iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
                               d->mode == documentOutline_SidebarMode ? tmBannerBackground_ColorId
                                                                      : uiBackgroundSidebar_ColorId);
     updateItemHeight_SidebarWidget_(d);
+    if (deviceType_App() != desktop_AppDeviceType && mode != bookmarks_SidebarMode) {
+        setMobileEditMode_SidebarWidget_(d, iFalse);
+    }
     /* Restore previous scroll position. */
     setScrollPos_ListWidget(list_SidebarWidget_(d), d->modeScroll[mode]);
     /* Title of the mobile sliding sheet. */