diff --git a/Vienna/Sources/Application/AppController.m b/Vienna/Sources/Application/AppController.m
index 88d943b9dc..c7d4e07cac 100644
--- a/Vienna/Sources/Application/AppController.m
+++ b/Vienna/Sources/Application/AppController.m
@@ -1949,7 +1949,7 @@ -(BOOL)handleKeyDown:(unichar)keyChar withFlags:(NSUInteger)flags
 			if (self.mainWindow.firstResponder == self.foldersTree.mainView) {
 				[self deleteFolder:self];
 				return YES;
-			} else if (self.mainWindow.firstResponder == (self.articleController.mainArticleView).mainView) {
+			} else if (self.browser.activeTab == nil) { // make sure we are in the articles tab
 				[self deleteMessage:self];
 				return YES;
 			}