diff --git a/localization/rssguard_en.ts b/localization/rssguard_en.ts
index d99c8d796..4387370f5 100644
--- a/localization/rssguard_en.ts
+++ b/localization/rssguard_en.ts
@@ -7132,42 +7132,42 @@ Post-processing script: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="178"/>
+        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="181"/>
         <source>Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="181"/>
+        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="184"/>
         <source>Local file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="184"/>
+        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="187"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="217"/>
+        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="220"/>
         <source>Cannot save data for feed: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="375"/>
+        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="378"/>
         <source>Cannot move feed, detailed information was logged via debug log.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="216"/>
+        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="219"/>
         <source>Cannot save feed data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="336"/>
+        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="339"/>
         <source>feed format not recognized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="374"/>
+        <location filename="../src/librssguard/services/standard/standardfeed.cpp" line="377"/>
         <source>Cannot move feed</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/src/librssguard/gui/notifications/articlelistnotification.cpp b/src/librssguard/gui/notifications/articlelistnotification.cpp
index 1183bb0ba..f01d2648a 100644
--- a/src/librssguard/gui/notifications/articlelistnotification.cpp
+++ b/src/librssguard/gui/notifications/articlelistnotification.cpp
@@ -88,6 +88,11 @@ void ArticleListNotification::loadResults(const QHash<Feed*, QList<Message>>& ne
 
 void ArticleListNotification::openArticleInArticleList() {
   emit openingArticleInArticleListRequested(m_ui.m_cmbFeeds->currentData().value<Feed*>(), selectedMessage());
+
+  if (m_newMessages.size() == 1 && m_newMessages.value(m_newMessages.keys().at(0)).size() == 1) {
+    // We only have 1 message in 1 feed.
+    emit closeRequested(this);
+  }
 }
 
 void ArticleListNotification::onMessageSelected(const QModelIndex& current, const QModelIndex& previous) {
@@ -118,6 +123,11 @@ void ArticleListNotification::openArticleInWebBrowser() {
   emit reloadMessageListRequested(false);
 
   qApp->web()->openUrlInExternalBrowser(msg.m_url);
+
+  if (m_newMessages.size() == 1 && m_newMessages.value(m_newMessages.keys().at(0)).size() == 1) {
+    // We only have 1 message in 1 feed.
+    emit closeRequested(this);
+  }
 }
 
 void ArticleListNotification::markAllRead() {
diff --git a/src/librssguard/services/standard/standardfeed.cpp b/src/librssguard/services/standard/standardfeed.cpp
index 411cfd42e..023ec1561 100644
--- a/src/librssguard/services/standard/standardfeed.cpp
+++ b/src/librssguard/services/standard/standardfeed.cpp
@@ -84,7 +84,10 @@ bool StandardFeed::editViaGui() {
                                                                                    {},
                                                                                    qApp->mainFormWidget()));
 
-  form_pointer->addEditFeed(this);
+  if (form_pointer->addEditFeed(this) != nullptr) {
+    setLastEtag({});
+  }
+
   return false;
 }