diff --git a/src/renderer/views/components/fullscreen.ejs b/src/renderer/views/components/fullscreen.ejs
index 151090f6..aaf07e39 100644
--- a/src/renderer/views/components/fullscreen.ejs
+++ b/src/renderer/views/components/fullscreen.ejs
@@ -51,13 +51,15 @@
                                 <div
                                         style="display: inline-block; -webkit-box-orient: horizontal; white-space: nowrap; margin-top: 0.25vh; overflow: hidden;">
                                     <div class="item-navigate song-artist" style="display: inline-block;"
-                                         @click="app.getNowPlayingItemDetailed(`artist`)">
+                                         @click="app.getNowPlayingItemDetailed(`artist`) && app.fullscreen(false)">
                                         {{ app.mk.nowPlayingItem["attributes"]["artistName"] }}
                                     </div>
+                                    <div class="song-artist" style="display: inline-block;">
+                                        {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? " — " : "" }}
+                                    </div>
                                     <div class="song-artist item-navigate" style="display: inline-block;"
-                                         @click="app.getNowPlayingItemDetailed('album')">
-                                        {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (" — " +
-                                        app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
+                                         @click="app.getNowPlayingItemDetailed('album') && app.fullscreen(false)">
+                                        {{ (app.mk.nowPlayingItem["attributes"]["albumName"]) ? (app.mk.nowPlayingItem["attributes"]["albumName"]) : "" }}
                                     </div>
                                 </div>
 
diff --git a/src/renderer/views/components/sidebar.ejs b/src/renderer/views/components/sidebar.ejs
index 4804aa27..031d062f 100644
--- a/src/renderer/views/components/sidebar.ejs
+++ b/src/renderer/views/components/sidebar.ejs
@@ -7,11 +7,11 @@
                     <input
                             type="search"
                             spellcheck="false"
-                            @click="$root.showSearch()"
+                            @click="app.appRoute('search');"
                             @focus="$root.search.showHints = true"
                             @blur="$root.setTimeout(()=>{$root.search.showHints = false}, 300)"
                             v-on:keyup.enter="$root.searchQuery();$root.search.showHints = false"
-                            @change="$root.showSearch();"
+                            @change="app.appRoute('search');"
                             @input="$root.getSearchHints()"
                             :placeholder="$root.getLz('term.search') + '...'"
                             v-model="$root.search.term"