diff --git a/plasma/applets/launcher/launcher.cpp b/plasma/applets/launcher/launcher.cpp
index f7557fa8..02a84cad 100644
--- a/plasma/applets/launcher/launcher.cpp
+++ b/plasma/applets/launcher/launcher.cpp
@@ -754,6 +754,14 @@ void LauncherFavorites::slotUpdateLayout()
                 kWarning() << "invalid first-time serivce" << name;
             }
         }
+        disconnect(
+            m_bookmarkmanager, SIGNAL(changed(QString,QString)),
+            this, SLOT(slotUpdateLayout())
+        );
+        disconnect(
+            m_bookmarkmanager, SIGNAL(bookmarksChanged(QString)),
+            this, SLOT(slotUpdateLayout())
+        );
         m_bookmarkmanager->emitChanged(bookmarkgroup);
     }
 
@@ -799,6 +807,18 @@ void LauncherFavorites::slotUpdateLayout()
         );
         bookmark = bookmarkgroup.next(bookmark);
     }
+
+    if (isfirsttime) {
+        locker.unlock();
+        connect(
+            m_bookmarkmanager, SIGNAL(changed(QString,QString)),
+            this, SLOT(slotUpdateLayout())
+        );
+        connect(
+            m_bookmarkmanager, SIGNAL(bookmarksChanged(QString)),
+            this, SLOT(slotUpdateLayout())
+        );
+    }
 }
 
 void LauncherFavorites::slotActivated()