diff --git a/src/preferences/fonts/FontSelectionView.cpp b/src/preferences/fonts/FontSelectionView.cpp
index 38197dfc6e..4285c74f67 100644
--- a/src/preferences/fonts/FontSelectionView.cpp
+++ b/src/preferences/fonts/FontSelectionView.cpp
@@ -346,7 +346,8 @@ FontSelectionView::SetDefaults()
 	defaultFont.SetFamilyAndStyle(family, style);
 	defaultFont.SetSize(size);
 
-	defaultFont.GetFamilyAndStyle(&family, &style);
+	if (defaultFont == fCurrentFont)
+		return;
 
 	_SelectCurrentFont(false);
 
diff --git a/src/preferences/fonts/MainWindow.cpp b/src/preferences/fonts/MainWindow.cpp
index 14193b1ec3..fa866a5655 100644
--- a/src/preferences/fonts/MainWindow.cpp
+++ b/src/preferences/fonts/MainWindow.cpp
@@ -116,7 +116,7 @@ MainWindow::MessageReceived(BMessage *message)
 
 		case kMsgSetDefaults:
 			fFontsView->SetDefaults();
-			fRevertButton->SetEnabled(true);
+			fRevertButton->SetEnabled(fFontsView->IsRevertable());
 			break;
 
 		case kMsgRevert: