diff --git a/src/forms/Bookmark/BookmarkView.cpp b/src/forms/Bookmark/BookmarkView.cpp
index b3a5a98..933b9b6 100644
--- a/src/forms/Bookmark/BookmarkView.cpp
+++ b/src/forms/Bookmark/BookmarkView.cpp
@@ -365,9 +365,10 @@ void BookmarkView::onTreeActivate( wxTreeEvent& event ) {
     if (tvi) {
         if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_ACTIVE) {
             if (!tvi->demod->isActive()) {
-                wxGetApp().setFrequency(tvi->demod->getFrequency());
-                wxGetApp().getDemodMgr().setActiveDemodulator(nullptr,true);
+                
+                wxGetApp().getDemodMgr().setActiveDemodulator(tvi->demod,true);
                 wxGetApp().getDemodMgr().setActiveDemodulator(tvi->demod,false);
+                wxGetApp().setFrequency(tvi->demod->getFrequency());
                 nextDemod = tvi->demod;
             }
         } else if (tvi->type == TreeViewItem::TREEVIEW_ITEM_TYPE_RECENT) {