3 files changed, 5 insertions, 3 deletions

diff --git a/src/app.c b/src/app.c
index 4045610e..30221582 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1268,7 +1268,7 @@ static iBool nextEvent_App_(iApp *d, enum iAppEventMode eventMode, SDL_Event *ev
     /* SDL regression circa 2.0.18? SDL_PollEvent() doesn't always return 
        events posted immediately beforehand. Waiting with a very short timeout
        seems to work better. */
-#if defined (iPlatformLinux)
+#if defined (iPlatformLinux) && SDL_VERSION_ATLEAST(2, 0, 18)
     return SDL_WaitEventTimeout(event, 1);
 #else
     return SDL_PollEvent(event);
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6a535882..fdb55232 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -2756,6 +2756,7 @@ static void updateDocument_DocumentWidget_(iDocumentWidget *d,
                 }
                 d->flags |= drawDownloadCounter_DocumentWidgetFlag;
                 clear_PtrSet(d->view.invalidRuns);
+                documentRunsInvalidated_DocumentWidget_(d);
                 deinit_String(&str);
                 return;
             }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index f5beb785..16677f9e 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -286,7 +286,8 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
             iZap(on);
             size_t numItems = 0;
             isEmpty = iTrue;
-            iConstForEach(PtrArray, i, listEntries_Feeds()) {
+            const iPtrArray *feedEntries = listEntries_Feeds();
+            iConstForEach(PtrArray, i, feedEntries) {
                 const iFeedEntry *entry = i.ptr;
                 if (isHidden_FeedEntry(entry)) {
                     continue; /* A hidden entry. */
@@ -350,7 +351,7 @@ static void updateItemsWithFlags_SidebarWidget_(iSidebarWidget *d, iBool keepAct
             }
             /* Actions. */
             if (!isMobile) {
-                if (!keepActions && !isEmpty) {
+                if (!keepActions && !isEmpty_PtrArray(feedEntries)) {
                     addActionButton_SidebarWidget_(d,
                                                    check_Icon
                                                    " ${sidebar.action.feeds.markallread}",