diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts
index abf1f0411..dabd926cc 100644
--- a/localization/rssguard_en.ts
+++ b/localization/rssguard_en.ts
@@ -921,12 +921,12 @@ Item ID: %5</source>
 <context>
     <name>FeedReader</name>
     <message>
-        <location filename="../src/librssguard/miscellaneous/feedreader.cpp" line="361"/>
+        <location filename="../src/librssguard/miscellaneous/feedreader.cpp" line="367"/>
         <source>Starting auto-download of some feeds&apos; articles</source>
         <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/librssguard/miscellaneous/feedreader.cpp" line="362"/>
+        <location filename="../src/librssguard/miscellaneous/feedreader.cpp" line="368"/>
         <source>I will auto-download new articles for %n feed(s).</source>
         <translation type="unfinished">
             <numerusform></numerusform>
diff --git a/src/librssguard/gui/dialogs/formsettings.cpp b/src/librssguard/gui/dialogs/formsettings.cpp
index e50dc394b..af4863c6d 100644
--- a/src/librssguard/gui/dialogs/formsettings.cpp
+++ b/src/librssguard/gui/dialogs/formsettings.cpp
@@ -58,8 +58,6 @@ FormSettings::FormSettings(QWidget& parent) : QDialog(&parent), m_settings(*qApp
   m_ui.m_listSettings->setMaximumWidth(m_ui.m_listSettings->sizeHintForColumn(0) +
                                        6 * m_ui.m_listSettings->frameWidth());
   m_ui.m_listSettings->setCurrentRow(0);
-
-  resize(qApp->settings()->value(GROUP(GUI), GUI::SettingsWindowInitialSize, size()).toSize());
 }
 
 FormSettings::~FormSettings() {
@@ -121,8 +119,6 @@ void FormSettings::applySettings() {
   }
 
   m_btnApply->setEnabled(false);
-
-  qApp->settings()->setValue(GROUP(GUI), GUI::SettingsWindowInitialSize, size());
 }
 
 void FormSettings::cancelSettings() {
diff --git a/src/librssguard/gui/guiutilities.cpp b/src/librssguard/gui/guiutilities.cpp
index 9b4ba5876..e30f8a56a 100644
--- a/src/librssguard/gui/guiutilities.cpp
+++ b/src/librssguard/gui/guiutilities.cpp
@@ -4,6 +4,7 @@
 
 #include "definitions/definitions.h"
 
+#include <QScreen>
 #include <QSettings>
 
 #if defined(Q_OS_ANDROID)
@@ -34,6 +35,22 @@ void GuiUtilities::applyDialogProperties(QWidget& widget, const QIcon& icon, con
   if (!title.isEmpty()) {
     widget.setWindowTitle(title);
   }
+
+  // We fix too big dialog size or out-of-bounds position.
+  auto size_widget = widget.size();
+  auto size_screen = widget.screen()->availableSize();
+
+  if (size_widget.width() > size_screen.width()) {
+    size_widget.setWidth(size_screen.width() * 0.9);
+  }
+
+  if (size_widget.height() > size_screen.height()) {
+    size_widget.setHeight(size_screen.height() * 0.9);
+  }
+
+  if (size_widget != widget.size()) {
+    widget.resize(size_widget);
+  }
 }
 
 void GuiUtilities::restoreState(QWidget* wdg, QByteArray state) {
diff --git a/src/librssguard/miscellaneous/feedreader.cpp b/src/librssguard/miscellaneous/feedreader.cpp
index fb3a5f972..ddc017bd8 100644
--- a/src/librssguard/miscellaneous/feedreader.cpp
+++ b/src/librssguard/miscellaneous/feedreader.cpp
@@ -333,6 +333,12 @@ void FeedReader::executeNextAutoUpdate() {
     synchronizeMessageData(caches);
   }
 
+  if (disable_update_with_window) {
+    qDebugNN << LOGSEC_CORE << "Delaying scheduled feed auto-download for some time since window "
+             << "is focused. Article cache was synchronised nonetheless.";
+    return;
+  }
+
   // Pass needed interval data and lets the model decide which feeds
   // should be updated in this pass.
   QDateTime current_time = QDateTime::currentDateTimeUtc();
diff --git a/src/librssguard/miscellaneous/settings.cpp b/src/librssguard/miscellaneous/settings.cpp
index 375a535c2..7b0844827 100644
--- a/src/librssguard/miscellaneous/settings.cpp
+++ b/src/librssguard/miscellaneous/settings.cpp
@@ -278,7 +278,6 @@ DVALUE(char*)
 GUI::StatusbarActionsDef = "m_barProgressDownloadAction,m_barProgressFeedsAction,m_actionUpdateAllItems,m_"
                            "actionUpdateSelectedItems,m_actionStopRunningItemsUpdate,m_actionFullscreen,m_actionQuit";
 
-DKEY GUI::SettingsWindowInitialSize = "settings_window_size";
 DKEY GUI::MainWindowInitialSize = "window_size";
 DKEY GUI::MainWindowInitialPosition = "window_position";
 
diff --git a/src/librssguard/miscellaneous/settings.h b/src/librssguard/miscellaneous/settings.h
index 7e81081bb..cb46d5844 100644
--- a/src/librssguard/miscellaneous/settings.h
+++ b/src/librssguard/miscellaneous/settings.h
@@ -292,7 +292,6 @@ namespace GUI {
   KEY StatusbarActions;
   VALUE(char*) StatusbarActionsDef;
 
-  KEY SettingsWindowInitialSize;
   KEY MainWindowInitialSize;
   KEY MainWindowInitialPosition;