diff --git a/AppController.m b/AppController.m
index c77c4d144a..2ce03fecc3 100644
--- a/AppController.m
+++ b/AppController.m
@@ -2330,8 +2330,8 @@ -(IBAction)localPerformFindPanelAction:(id)sender
 	{
 	case NSFindPanelActionSetFindString:
 		[self setFocusToSearchField:self];
-		[searchField setStringValue:[NSApp currentSelection]];
-		[searchPanel setSearchString:[NSApp currentSelection]];
+		[searchField setStringValue:[NSApp currentTextSelection]];
+		[searchPanel setSearchString:[NSApp currentTextSelection]];
 		break;
 
 	case NSFindPanelActionShowFindPanel:
@@ -3407,12 +3407,12 @@ -(void)blogWithExternalEditor:(NSString *)externalEditorBundleIdentifier;
 	// If the active tab is a web view, blog the URL
 	NSView<BaseView> * theView = [browserView activeTabItemView];
 	if ([theView isKindOfClass:[BrowserPane class]])
-		[self sendBlogEvent:externalEditorBundleIdentifier title:[browserView tabItemViewTitle:[browserView activeTabItemView]] url:[theView viewLink] body:[NSApp currentSelection] author:@"" guid:@""];
+		[self sendBlogEvent:externalEditorBundleIdentifier title:[browserView tabItemViewTitle:[browserView activeTabItemView]] url:[theView viewLink] body:[NSApp currentTextSelection] author:@"" guid:@""];
 	else
 	{
 		// Get the currently selected articles from the ArticleView and iterate over them.
 		for (Article * currentArticle in [mainArticleView markedArticleRange])
-			[self sendBlogEvent:externalEditorBundleIdentifier title:[currentArticle title] url:[currentArticle link] body:[NSApp currentSelection] author:[currentArticle author] guid:[currentArticle guid]];
+			[self sendBlogEvent:externalEditorBundleIdentifier title:[currentArticle title] url:[currentArticle link] body:[NSApp currentTextSelection] author:[currentArticle author] guid:[currentArticle guid]];
 	}
 }
 
diff --git a/ViennaApp.h b/ViennaApp.h
index a28faaf2b5..a514bbd30a 100644
--- a/ViennaApp.h
+++ b/ViennaApp.h
@@ -56,7 +56,7 @@ OSStatus keyPressed(EventHandlerCallRef nextHandler, EventRef theEvent, void *us
 -(NSArray *)folders;
 -(BOOL)isRefreshing;
 -(int)totalUnreadCount;
--(NSString *)currentSelection;
+-(NSString *)currentTextSelection;
 -(NSString *)documentHTMLSource;
 
 // Change folder selection
diff --git a/ViennaApp.m b/ViennaApp.m
index bb0b55ccc5..68362a634e 100644
--- a/ViennaApp.m
+++ b/ViennaApp.m
@@ -267,7 +267,7 @@ -(int)totalUnreadCount
  * Returns the current selected text from the article view or an empty
  * string if there is no selection.
  */
--(NSString *)currentSelection
+-(NSString *)currentTextSelection
 {
 	NSView<BaseView> * theView = [[[self delegate] browserView] activeTabItemView];
 	WebView * webPane = nil;