diff --git a/src/ui/pluginBanner/pluginBanner.component.ts b/src/ui/pluginBanner/pluginBanner.component.ts
index 00e65609291fec243271a80a8d8ae88dd1654a1d..cef22dab98c5acd66ce308f345da4b0eb2330356 100644
--- a/src/ui/pluginBanner/pluginBanner.component.ts
+++ b/src/ui/pluginBanner/pluginBanner.component.ts
@@ -16,9 +16,15 @@ export class PluginBannerUI{
   }
 
   clickPlugin(plugin:PluginManifest){
-    if(PLUGINDEV)
+    if(this.pluginEnabledFlag)
       this.pluginServices.launchPlugin(plugin)
     else
       return
   }
+
+  get pluginEnabledFlag(){
+    return PLUGINDEV || BUNDLEDPLUGINS.length > 0
+      ? true
+      : false
+  }
 }
\ No newline at end of file
diff --git a/src/ui/pluginBanner/pluginBanner.template.html b/src/ui/pluginBanner/pluginBanner.template.html
index 09b9dd68395954dcc358bc10e1d5163374784053..d88e991af9c9dfbe02335b789c60c398ba98d392 100644
--- a/src/ui/pluginBanner/pluginBanner.template.html
+++ b/src/ui/pluginBanner/pluginBanner.template.html
@@ -1,8 +1,9 @@
 <div 
   placement = "bottom"
-  tooltip = "coming soon"
+  [tooltip] = "pluginEnabledFlag ? null : 'coming soon'"
   *ngFor = "let plugin of pluginServices.fetchedPluginManifests"
   (click) = "clickPlugin(plugin)"
-  class = "btn btn-default btn-disabled">
+  [ngClass] = "{'btn-disabled' : !pluginEnabledFlag}"
+  class = "btn btn-default">
   {{ plugin.displayName ? plugin.displayName : plugin.name }}
 </div>
\ No newline at end of file