diff --git a/ext/src/popup/index.html b/ext/src/popup/index.html
index 59a008d..2821f73 100755
--- a/ext/src/popup/index.html
+++ b/ext/src/popup/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8">
-        <link rel="stylesheet" href="index.css">
+        <link rel="stylesheet" href="styles/index.css">
         <script src="bundle.js" defer></script>
     </head>
     <body>
diff --git a/ext/src/popup/index.jsx b/ext/src/popup/index.jsx
index 530d616..1bc4b85 100755
--- a/ext/src/popup/index.jsx
+++ b/ext/src/popup/index.jsx
@@ -5,6 +5,18 @@ import ReactDOM             from "react-dom";
 
 const _ = browser.i18n.getMessage;
 
+// macOS styles
+browser.runtime.getPlatformInfo()
+    .then(platformInfo => {
+        if (platformInfo.os === "mac") {
+            const link = document.createElement("link");
+            link.rel = "stylesheet";
+            link.href = "styles/mac.css";
+            document.head.appendChild(link);
+        }
+    });
+
+
 let winWidth = 350;
 let winHeight = 200;
 
@@ -97,11 +109,12 @@ class App extends Component {
                     to:
                 </div>
                 <ul className="receivers">
-                    { this.state.receivers.map(receiver => {
+                    { this.state.receivers.map((receiver, i) => {
                         return (
                            <Receiver receiver={receiver}
                                      onCast={this.onCast.bind(this)}
-                                     isLoading={this.state.isLoading} />
+                                     isLoading={this.state.isLoading}
+                                     key={i}/>
                         );
                     })}
                 </ul>
diff --git a/ext/src/popup/index.css b/ext/src/popup/styles/index.css
similarity index 100%
rename from ext/src/popup/index.css
rename to ext/src/popup/styles/index.css
diff --git a/ext/src/popup/styles/mac.css b/ext/src/popup/styles/mac.css
new file mode 100755
index 0000000..056e842
--- /dev/null
+++ b/ext/src/popup/styles/mac.css
@@ -0,0 +1,21 @@
+body {
+    background: rgb(236, 236, 236);
+    font: menu;
+}
+
+button,
+select {
+    font: inherit;
+}
+
+button:not([disabled]):hover:active {
+    color: -moz-mac-buttonactivetext;
+}
+
+.receiver-address {
+    font: message-box;
+}
+
+.receiver-connect {
+    height: 22px;
+}
