diff --git a/config/env/all.js b/config/env/all.js
index 4f98b20f..bbe5bfe9 100644
--- a/config/env/all.js
+++ b/config/env/all.js
@@ -43,6 +43,7 @@ module.exports = {
     audioRegex: /(mp3|m4a|mp4a|aac)$/i,
     imageRegex: /(jpg|jpeg|png|gif|bmp)$/i,
     htmlRegex: /\.html$/,
+    noticeRegex: /\.html$/,
     zipfileRegex: /(.zip|.gz|.bz2)$/i,
     repofileRegex: /\.repo$/i,
     liveStreamRegex: /\.tv$/i,
diff --git a/public/app/js/controllers/playlists.js b/public/app/js/controllers/playlists.js
index fc40c2f9..8e31c82f 100644
--- a/public/app/js/controllers/playlists.js
+++ b/public/app/js/controllers/playlists.js
@@ -396,6 +396,7 @@ angular.module('piPlaylists.controllers', [])
                 return !(file.match(piConstants.audioRegex) ||
                 file.match(piConstants.liveStreamRegex) || file.match(piConstants.CORSLink));
             })
+            
 
             $scope.modal = $modal.open({
                 templateUrl: '/app/templates/linkfile-popup.html',
@@ -403,6 +404,10 @@ angular.module('piPlaylists.controllers', [])
             });
         }
 
+        $scope.changeTab = function(index) {
+            $scope.tabIndex = index;
+        }
+
         $scope.linkFileSave = function(file){
             $scope.selectedAsset[$scope.selectedZone] = file;
             $scope.saveData();
diff --git a/public/app/templates/linkfile-popup.html b/public/app/templates/linkfile-popup.html
index 88e3ed44..d8c21205 100644
--- a/public/app/templates/linkfile-popup.html
+++ b/public/app/templates/linkfile-popup.html
@@ -8,7 +8,7 @@ <h4>File to be played in the {{selectedZone}} zone
 <div class="modal-body">
   <div class="panel-body">
     <tabset>
-      <tab index="0" heading="Assets" active="tabIndex == 0">
+      <tab index="0" heading="Assets" active="tabIndex == 0" ng-click="changeTab($index)">
         <ul class="list-group">
           <li class="list-group-item list-group-item-info">
             <input type="text" placeholder="Filter by Name" ng-model="search" class="form-control"/>
@@ -37,7 +37,7 @@ <h4 class="media-heading">&nbsp;{{file.fileDetails.name}}</h4>
           </li>
         </ul>
       </tab>
-      <tab index="1" heading="Playlists(needs 1.7.0)" active="tabIndex == 1">
+      <tab index="1" heading="Playlists(needs 1.7.0)" active="tabIndex == 1" ng-click="changeTab($index)">
         <ul class="list-group">
           <li class="list-group-item list-group-item-info">
             <input type="text" placeholder="{{'Filter by Name' }}" ng-model="search" class="form-control"/>
diff --git a/public/app/templates/linkfile-popup.jade b/public/app/templates/linkfile-popup.jade
index d81172b8..8e34ba6f 100644
--- a/public/app/templates/linkfile-popup.jade
+++ b/public/app/templates/linkfile-popup.jade
@@ -5,7 +5,7 @@
 .modal-body
     .panel-body
         tabset
-            tab(index="0",heading='Assets',active="tabIndex == 0")
+            tab(index="0",heading='Assets',active="tabIndex == 0",ng-click="changeTab($index)")
                 ul.list-group
                     li.list-group-item.list-group-item-info
                         input.form-control(type="text",placeholder="Filter by Name",ng-model="search")
@@ -43,7 +43,7 @@
 
 
 
-            tab(index="1",heading='Playlists(needs 1.7.0)',active="tabIndex == 1")
+            tab(index="1",heading='Playlists(needs 1.7.0)',active="tabIndex == 1",ng-click="changeTab($index)")
                 ul.list-group
                     li.list-group-item.list-group-item-info
                         input.form-control(type="text",placeholder="{{'Filter by Name' }}",ng-model="search")