diff --git a/src/lib/bookmarks/bookmarksicon.cpp b/src/lib/bookmarks/bookmarksicon.cpp
index 656a8566..649a470b 100644
--- a/src/lib/bookmarks/bookmarksicon.cpp
+++ b/src/lib/bookmarks/bookmarksicon.cpp
@@ -1,120 +1,123 @@
 /* ============================================================
 * Falkon - Qt web browser
 * Copyright (C) 2010-2014  David Rosca <nowrep@gmail.com>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 3 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 * ============================================================ */
 #include "bookmarksicon.h"
 #include "bookmarkswidget.h"
 #include "bookmarks.h"
 #include "mainapplication.h"
 #include "webview.h"
 #include "locationbar.h"
 #include "pluginproxy.h"
 #include "speeddial.h"
 
 #include <QStyle>
 #include <QContextMenuEvent>
 
 BookmarksIcon::BookmarksIcon(QWidget* parent)
     : ClickableLabel(parent)
     , m_view(0)
     , m_bookmark(0)
 {
     setObjectName("locationbar-bookmarkicon");
     setCursor(Qt::PointingHandCursor);
     setToolTip(tr("Bookmark this Page"));
     setFocusPolicy(Qt::ClickFocus);
 
     connect(mApp->bookmarks(), SIGNAL(bookmarkAdded(BookmarkItem*)), this, SLOT(bookmarksChanged()));
     connect(mApp->bookmarks(), SIGNAL(bookmarkRemoved(BookmarkItem*)), this, SLOT(bookmarksChanged()));
     connect(mApp->bookmarks(), SIGNAL(bookmarkChanged(BookmarkItem*)), this, SLOT(bookmarksChanged()));
     connect(mApp->plugins()->speedDial(), SIGNAL(pagesChanged()), this, SLOT(speedDialChanged()));
 
     connect(this, SIGNAL(clicked(QPoint)), this, SLOT(iconClicked()));
 }
 
 void BookmarksIcon::setWebView(WebView* view)
 {
     m_view = view;
+    connect(view, &WebView::urlChanged, this, [this](const QUrl &url) {
+        checkBookmark(url);
+    });
 }
 
 void BookmarksIcon::checkBookmark(const QUrl &url, bool forceCheck)
 {
     if (!forceCheck && m_lastUrl == url) {
         return;
     }
 
     QList<BookmarkItem*> items = mApp->bookmarks()->searchBookmarks(url);
     m_bookmark = items.isEmpty() ? 0 : items.at(0);
 
     if (m_bookmark || mApp->plugins()->speedDial()->pageForUrl(url).isValid()) {
         setBookmarkSaved();
     }
     else {
         setBookmarkDisabled();
     }
 
     m_lastUrl = url;
 }
 
 void BookmarksIcon::bookmarksChanged()
 {
     checkBookmark(m_lastUrl, true);
 }
 
 void BookmarksIcon::speedDialChanged()
 {
     checkBookmark(m_lastUrl, true);
 }
 
 void BookmarksIcon::iconClicked()
 {
     if (!m_view) {
         return;
     }
 
     BookmarksWidget* widget = new BookmarksWidget(m_view, m_bookmark, parentWidget());
     widget->showAt(parentWidget());
 }
 
 void BookmarksIcon::setBookmarkSaved()
 {
     setProperty("bookmarked", QVariant(true));
     style()->unpolish(this);
     style()->polish(this);
     setToolTip(tr("Edit this bookmark"));
 }
 
 void BookmarksIcon::setBookmarkDisabled()
 {
     setProperty("bookmarked", QVariant(false));
     style()->unpolish(this);
     style()->polish(this);
     setToolTip(tr("Bookmark this Page"));
 }
 
 void BookmarksIcon::contextMenuEvent(QContextMenuEvent* ev)
 {
     // Prevent propagating to LocationBar
     ev->accept();
 }
 
 void BookmarksIcon::mousePressEvent(QMouseEvent* ev)
 {
     ClickableLabel::mousePressEvent(ev);
 
     // Prevent propagating to LocationBar
     ev->accept();
 }