diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index b602cd783..6fede8370 100644
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -24,6 +24,7 @@
 	  
 	  Fixed:
 	  <ul>
+	  	<li>Fixed bug with updating feed. (bug #131)</li>
       <li>Solved problem when user selects HUGE number of individual messages and marks them read/unread. Reselecting them after change may cause RSS Guard to hang.</li>
       <li>Better info in popup notification when many feeds are updated.</li>
       <li>Fixed obtaining of contents in RSS 2.0 feed entries. (bug #130)</li>
diff --git a/src/core/feedsmodel.cpp b/src/core/feedsmodel.cpp
index 6563466d5..2a2a3164d 100755
--- a/src/core/feedsmodel.cpp
+++ b/src/core/feedsmodel.cpp
@@ -72,11 +72,6 @@ FeedsModel::FeedsModel(QObject *parent)
 
   //loadActivatedServiceAccounts();
   updateAutoUpdateStatus();
-
-  if (qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::FeedsUpdateOnStartup)).toBool()) {
-    qDebug("Requesting update for all feeds on application startup.");
-    QTimer::singleShot(STARTUP_UPDATE_DELAY, this, SLOT(updateAllItems()));
-  }
 }
 
 FeedsModel::~FeedsModel() {
@@ -739,6 +734,11 @@ void FeedsModel::loadActivatedServiceAccounts() {
       addServiceAccount(root);
     }
   }
+
+  if (qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::FeedsUpdateOnStartup)).toBool()) {
+    qDebug("Requesting update for all feeds on application startup.");
+    QTimer::singleShot(STARTUP_UPDATE_DELAY, this, SLOT(updateAllFeeds()));
+  }
 }
 
 QList<Feed*> FeedsModel::feedsForIndex(const QModelIndex &index) {
diff --git a/src/core/feedsmodel.h b/src/core/feedsmodel.h
index 73c641b6c..6807b6709 100755
--- a/src/core/feedsmodel.h
+++ b/src/core/feedsmodel.h
@@ -145,9 +145,6 @@ class FeedsModel : public QAbstractItemModel {
     // Schedules given feeds for update.
     void updateFeeds(const QList<Feed*> &feeds);
 
-    // Schedules all feeds from all accounts for update.
-    void updateAllFeeds();
-
     // Adds given service root account.
     bool addServiceAccount(ServiceRoot *root);
 
@@ -155,6 +152,9 @@ class FeedsModel : public QAbstractItemModel {
     void loadActivatedServiceAccounts();
 
   public slots:
+    // Schedules all feeds from all accounts for update.
+    void updateAllFeeds();
+
     // Checks if new parent node is different from one used by original node.
     // If it is, then it reassigns original_node to new parent.
     void reassignNodeToNewParent(RootItem *original_node, RootItem *new_parent);
diff --git a/src/main.cpp b/src/main.cpp
index 94736dd08..eb23d82c4 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -117,10 +117,6 @@ int main(int argc, char *argv[]) {
     qApp->showTrayIcon();
   }
 
-  if (qApp->settings()->value(GROUP(General), SETTING(General::UpdateOnStartup)).toBool()) {
-    QTimer::singleShot(STARTUP_UPDATE_DELAY, application.system(), SLOT(checkForUpdatesOnStartup()));
-  }
-
   // Load activated accounts.
   qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->loadActivatedServiceAccounts();
   qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->loadExpandedStates();
@@ -137,6 +133,11 @@ int main(int argc, char *argv[]) {
     qApp->showGuiMessage(QSL(APP_NAME), QObject::tr("Welcome to %1.").arg(APP_LONG_NAME), QSystemTrayIcon::NoIcon);
   }
 
+  if (qApp->settings()->value(GROUP(General), SETTING(General::UpdateOnStartup)).toBool()) {
+    QTimer::singleShot(STARTUP_UPDATE_DELAY, application.system(), SLOT(checkForUpdatesOnStartup()));
+  }
+
+
   // Enter global event loop.
   return Application::exec();
 }