diff --git a/qml/pages/MainPage.qml b/qml/pages/MainPage.qml
index 2897ba6..e676870 100644
--- a/qml/pages/MainPage.qml
+++ b/qml/pages/MainPage.qml
@@ -69,10 +69,11 @@ Page {
             onOpenDrawer:  infoPanel.open = setDrawer
         }
         MyList{
-            id: tlPublic;
-            title: qsTr("Federated")
-            type: "timelines/public"
-            mdl: Logic.modelTLpublic
+            id: tlNotifications;
+            title: qsTr("Notifications")
+            type: "notifications"
+            notifier: true
+            mdl: Logic.modelTLnotifications
             width: parent.itemWidth
             height: parent.itemHeight
             onOpenDrawer:  infoPanel.open = setDrawer
@@ -88,11 +89,10 @@ Page {
             onOpenDrawer:  infoPanel.open = setDrawer
         }
         MyList{
-            id: tlNotifications;
-            title: qsTr("Notifications")
-            type: "notifications"
-            notifier: true
-            mdl: Logic.modelTLnotifications
+            id: tlPublic;
+            title: qsTr("Federated")
+            type: "timelines/public"
+            mdl: Logic.modelTLpublic
             width: parent.itemWidth
             height: parent.itemHeight
             onOpenDrawer:  infoPanel.open = setDrawer
@@ -260,6 +260,11 @@ Page {
             slideshow.positionViewAtIndex(4, ListView.SnapToItem)
             navigation.navigateTo('search')
 
+        } else if (test.length === 4 && test[3][0] === "@" ) {
+            tlSearch.search = decodeURIComponent("@"+test[3].substring(1)+"@"+test[2])
+            slideshow.positionViewAtIndex(4, ListView.SnapToItem)
+            navigation.navigateTo('search')
+
         } else {
             Qt.openUrlExternally(href);
         }