diff --git a/app/NativeMacReceiverSelector/ViewController.swift b/app/NativeMacReceiverSelector/ViewController.swift
index 8d470d9..f986d73 100644
--- a/app/NativeMacReceiverSelector/ViewController.swift
+++ b/app/NativeMacReceiverSelector/ViewController.swift
@@ -106,33 +106,48 @@ class ViewController : NSViewController {
         stackView.addArrangedSubview(mediaTypeStackView)
 
 
-        /**
-         * For each receiver in the initData list, create a new
-         * ReceiverView, set self as a ReceiverViewDelegate and
-         * appends to main stack view.
-         *
-         * Keeps a reference to the receiver view to call disable()
-         * later.
-         */
-        for receiver in initData.receivers {
-            // Create separator between last receiver / media type
-            let receiverSeparator = NSBox()
-            receiverSeparator.boxType = .separator
+        if initData.receivers.count < 1 {
+            let separator = NSBox()
+            separator.boxType = .separator
 
-            let receiverView = ReceiverView(receiver: receiver)
-            receiverView.receiverViewDelegate = self
+            let notFoundStackView = NSStackView(views: [
+                makeLabel(initData.i18n_noReceiversFound)
+            ])
 
-            if UInt(initData.availableMediaTypes) == 0
-                    || (initData.availableMediaTypes
-                            & initData.defaultMediaType.rawValue) == 0 {
-                receiverView.isEnabled = false
+            notFoundStackView.alignment = .centerX
+            notFoundStackView.edgeInsets = NSEdgeInsetsMake(18, 0, 18, 0)
+
+            stackView.addArrangedSubview(separator)
+            stackView.addArrangedSubview(notFoundStackView)
+        } else {
+            /**
+             * For each receiver in the initData list, create a new
+             * ReceiverView, set self as a ReceiverViewDelegate and
+             * appends to main stack view.
+             *
+             * Keeps a reference to the receiver view to call disable()
+             * later.
+             */
+            for receiver in initData.receivers {
+                // Create separator between last receiver / media type
+                let receiverSeparator = NSBox()
+                receiverSeparator.boxType = .separator
+
+                let receiverView = ReceiverView(receiver: receiver)
+                receiverView.receiverViewDelegate = self
+
+                if UInt(initData.availableMediaTypes) == 0
+                        || (initData.availableMediaTypes
+                                & initData.defaultMediaType.rawValue) == 0 {
+                    receiverView.isEnabled = false
+                }
+
+
+                self.receiverViews.append(receiverView)
+
+                stackView.addArrangedSubview(receiverSeparator)
+                stackView.addArrangedSubview(receiverView)
             }
-
-
-            self.receiverViews.append(receiverView)
-
-            stackView.addArrangedSubview(receiverSeparator)
-            stackView.addArrangedSubview(receiverView)
         }
 
 
diff --git a/app/NativeMacReceiverSelector/models/InitData.swift b/app/NativeMacReceiverSelector/models/InitData.swift
index e616e75..641eccb 100644
--- a/app/NativeMacReceiverSelector/models/InitData.swift
+++ b/app/NativeMacReceiverSelector/models/InitData.swift
@@ -16,4 +16,5 @@ struct InitData : Codable {
     let i18n_mediaTypeFile: String
     let i18n_mediaSelectCastLabel: String
     let i18n_mediaSelectToLabel: String
+    let i18n_noReceiversFound: String
 }
diff --git a/ext/src/_locales/en/messages.json b/ext/src/_locales/en/messages.json
index 618da31..105032c 100755
--- a/ext/src/_locales/en/messages.json
+++ b/ext/src/_locales/en/messages.json
@@ -34,6 +34,10 @@
         "message": "to:"
       , "description": "Cast <select> (to:)"
     }
+  , "popupNoReceiversFound": {
+        "message": "No receiver devices found"
+      , "description": "Message displayed in the receiver selector if there are no available receivers."
+    }
   , "popupCastButtonTitle": {
         "message": "Cast"
       , "description": "Button text for each receiver entry in the receiver selector."
diff --git a/ext/src/background/StatusManager.ts b/ext/src/background/StatusManager.ts
index bccc9c0..ba618f3 100644
--- a/ext/src/background/StatusManager.ts
+++ b/ext/src/background/StatusManager.ts
@@ -149,10 +149,15 @@ export default new class StatusManager
 
         // Cleanup
         this.receivers.clear();
-        this.bridgePort.onDisconnect.removeListener(
-                this.onBridgePortDisconnect);
-        this.bridgePort.onMessage.removeListener(this.onBridgePortMessage);
-        this.bridgePort = null;
+
+        if (this.bridgePort) {
+            this.bridgePort.onDisconnect.removeListener(
+                    this.onBridgePortDisconnect);
+            this.bridgePort.onMessage.removeListener(
+                    this.onBridgePortMessage);
+
+            this.bridgePort = null;
+        }
 
         window.setTimeout(async () => {
             this.bridgePort = await this.createBridgePort();
diff --git a/ext/src/background/background.ts b/ext/src/background/background.ts
index ba995aa..2fe3f71 100755
--- a/ext/src/background/background.ts
+++ b/ext/src/background/background.ts
@@ -44,7 +44,7 @@ browser.runtime.onInstalled.addListener(async details => {
 
 
 function initBrowserAction () {
-    browser.browserAction.disable();
+    /*browser.browserAction.disable();
 
     function onServiceChange () {
         if (StatusManager.getReceivers().length) {
@@ -55,7 +55,7 @@ function initBrowserAction () {
     }
 
     StatusManager.addEventListener("serviceUp", onServiceChange);
-    StatusManager.addEventListener("serviceDown", onServiceChange);
+    StatusManager.addEventListener("serviceDown", onServiceChange);*/
 
 
     /**
diff --git a/ext/src/background/receiverSelector/NativeReceiverSelector.ts b/ext/src/background/receiverSelector/NativeReceiverSelector.ts
index b667e1a..6b5a077 100644
--- a/ext/src/background/receiverSelector/NativeReceiverSelector.ts
+++ b/ext/src/background/receiverSelector/NativeReceiverSelector.ts
@@ -100,6 +100,7 @@ export default class NativeReceiverSelector
               , i18n_mediaTypeFile: _("popupMediaTypeFile")
               , i18n_mediaSelectCastLabel: _("popupMediaSelectCastLabel")
               , i18n_mediaSelectToLabel: _("popupMediaSelectToLabel")
+              , i18n_noReceiversFound: _("popupNoReceiversFound")
             })
         });
 
diff --git a/ext/src/ui/popup/index.tsx b/ext/src/ui/popup/index.tsx
index faa389d..3c0ef0c 100755
--- a/ext/src/ui/popup/index.tsx
+++ b/ext/src/ui/popup/index.tsx
@@ -152,13 +152,17 @@ class PopupApp extends Component<{}, PopupAppState> {
                     </div>
                 </div>
                 <ul className="receivers">
-                    { this.state.receivers && this.state.receivers.map(
-                            (receiver, i) => (
-                        <ReceiverEntry receiver={ receiver }
-                                       onCast={ this.onCast }
-                                       isLoading={ this.state.isLoading }
-                                       canCast={ canCast }
-                                       key={ i }/> ))}
+                    { this.state.receivers && this.state.receivers.length
+                        ? this.state.receivers.map((receiver, i) => (
+                            <ReceiverEntry receiver={ receiver }
+                                           onCast={ this.onCast }
+                                           isLoading={ this.state.isLoading }
+                                           canCast={ canCast }
+                                           key={ i } /> ))
+                        : (
+                            <div className="receivers__not-found">
+                                { _("popupNoReceiversFound") }
+                            </div> )}
                 </ul>
             </div>
         );
diff --git a/ext/src/ui/popup/styles/index.css b/ext/src/ui/popup/styles/index.css
index 789a8ad..7f0f013 100755
--- a/ext/src/ui/popup/styles/index.css
+++ b/ext/src/ui/popup/styles/index.css
@@ -33,6 +33,14 @@ body {
     padding: initial;
 }
 
+.receivers__not-found {
+    align-items: center;
+    display: flex;
+    height: 50px;
+    justify-content: center;
+    padding: 0.75em 1em;
+}
+
 .receiver {
     column-gap: 0.75em;
     display: grid;