diff --git a/src/Ombi/ClientApp/app/search/music/albumsearch.component.html b/src/Ombi/ClientApp/app/search/music/albumsearch.component.html
index bb8d304b2..ccd6b3260 100644
--- a/src/Ombi/ClientApp/app/search/music/albumsearch.component.html
+++ b/src/Ombi/ClientApp/app/search/music/albumsearch.component.html
@@ -11,7 +11,7 @@
         <a href="" target="_blank">
                 <h4>{{result.title}}</h4>
         </a>
-        <a href="" target="_blank">
+        <a href="" (click)="selectArtist($event, result.foreignArtistId)">
             <h4>{{result.artistName}}</h4>
         </a>
     <span class="tags">
@@ -22,6 +22,9 @@
 
         <a *ngIf="result.trailer" href="{{result.trailer}}" id="trailerLabel" target="_blank"><span class="label label-info" [translate]="'Search.Movies.Trailer'"></span></a> -->
         
+        <ng-template [ngIf]="result.releaseDate"><span class="label label-info" id="availableLabel">Release Date: {{result.releaseDate | date:'yyyy-MM-dd'}}</span></ng-template>
+
+
         <ng-template [ngIf]="result.available"><span class="label label-success" id="availableLabel" [translate]="'Common.Available'"></span></ng-template>
         <ng-template [ngIf]="result.approved && !result.available"><span class="label label-info" id="processingRequestLabel" [translate]="'Common.ProcessingRequest'"></span></ng-template>
         <ng-template [ngIf]="result.requested && !result.approved && !result.available"><span class="label label-warning" id="pendingApprovalLabel" [translate]="'Common.PendingApproval'"></span></ng-template>
diff --git a/src/Ombi/ClientApp/app/search/music/albumsearch.component.ts b/src/Ombi/ClientApp/app/search/music/albumsearch.component.ts
index 99f27f08f..59314df84 100644
--- a/src/Ombi/ClientApp/app/search/music/albumsearch.component.ts
+++ b/src/Ombi/ClientApp/app/search/music/albumsearch.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input } from "@angular/core";
+import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 
 import { AuthService } from "../../auth/auth.service";
@@ -15,6 +15,8 @@ export class AlbumSearchComponent {
     @Input() public result: ISearchAlbumResult;
     public engineResult: IRequestEngineResult;
     @Input() public defaultPoster: string;
+    
+    @Output() public setSearch = new EventEmitter<string>();
 
     constructor(
         private requestService: RequestService,
@@ -22,6 +24,11 @@ export class AlbumSearchComponent {
         private readonly translate: TranslateService) {       
     }
 
+    public selectArtist(event: Event, artistId: string) {
+        event.preventDefault();
+        this.setSearch.emit(artistId);
+    }
+
     public request(searchResult: ISearchMovieResult) {
         searchResult.requested = true;
         searchResult.requestProcessing = true;
diff --git a/src/Ombi/ClientApp/app/search/music/musicsearch.component.html b/src/Ombi/ClientApp/app/search/music/musicsearch.component.html
index 28ea1b399..e9dc8637e 100644
--- a/src/Ombi/ClientApp/app/search/music/musicsearch.component.html
+++ b/src/Ombi/ClientApp/app/search/music/musicsearch.component.html
@@ -8,9 +8,9 @@
     </div>
     <div class="form-group">
             <div class="radio">
-                <input type="radio" id="Artist" name="Mode" checked="checked" (click)="searchMode(false)">
+                <input type="radio" id="Artist" name="Mode" [checked]="!searchAlbum" (click)="searchMode(false)">
                 <label for="Artist">Artist Search</label>
-                <input type="radio" id="Album" name="Mode" (click)="searchMode(true)">
+                <input type="radio" id="Album" name="Mode" [checked]="searchAlbum" (click)="searchMode(true)">
                 <label for="Album">Album Search</label>
             </div>
         </div>
@@ -32,7 +32,7 @@
             <br/>
         </div>
         <div *ngFor="let result of albumResult">
-            <album-search [result]="result" [defaultPoster]="defaultPoster"></album-search>
+            <album-search [result]="result" [defaultPoster]="defaultPoster" (setSearch)="setArtistSearch($event)"></album-search>
         <br/>
         <br/>
     </div>
diff --git a/src/Ombi/ClientApp/app/search/music/musicsearch.component.ts b/src/Ombi/ClientApp/app/search/music/musicsearch.component.ts
index 546fde9f6..e17187355 100644
--- a/src/Ombi/ClientApp/app/search/music/musicsearch.component.ts
+++ b/src/Ombi/ClientApp/app/search/music/musicsearch.component.ts
@@ -100,6 +100,12 @@ export class MusicSearchComponent implements OnInit {
         }
     }
 
+    public setArtistSearch(artistId: string) {
+        this.searchAlbum = false;
+        this.clearAlbumResults();
+        this.searchChanged.next(`lidarr:${artistId}`);
+    }
+
     public request(searchResult: ISearchMovieResult) {
         searchResult.requested = true;
         searchResult.requestProcessing = true;