diff --git a/app/tray_icon.js b/app/tray_icon.js
index f803ac6b0..7dfdf1fd2 100644
--- a/app/tray_icon.js
+++ b/app/tray_icon.js
@@ -65,12 +65,13 @@ function createTrayIcon(getMainWindow, messages) {
     trayContextMenu = Menu.buildFromTemplate([
       {
         id: 'toggleWindowVisibility',
-        label: messages[mainWindow.isVisible() ? 'hide' : 'show'].message,
+        label:
+          messages[mainWindow.isVisible() ? 'appMenuHide' : 'show'].message,
         click: tray.toggleWindowVisibility,
       },
       {
         id: 'quit',
-        label: messages.quit.message,
+        label: messages.appMenuQuit.message,
         click: app.quit.bind(app),
       },
     ]);
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 097556d16..3f3cb13c4 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -391,7 +391,10 @@
       this.window.addEventListener('resize', this.onResize);
 
       this.onFocus = () => {
-        if (this.$el.css('display') !== 'none') {
+        if (
+          this.$el.css('display') !== 'none' &&
+          this.$el.css('display') !== ''
+        ) {
           this.markRead();
         }
       };