diff --git a/Playlist/PlaylistController.m b/Playlist/PlaylistController.m
index 37d15d86e..db743e7f7 100644
--- a/Playlist/PlaylistController.m
+++ b/Playlist/PlaylistController.m
@@ -318,18 +318,7 @@ static inline void dispatch_sync_reentrant(dispatch_queue_t queue, dispatch_bloc
 		if(cellView.textField) {
 			cellView.textField.allowsDefaultTighteningForTruncation = YES;
 
-			NSFont *sysFont = [NSFont systemFontOfSize:fontSize];
-
-			NSFontDescriptor *fontDesc = [sysFont fontDescriptor];
-
-			NSDictionary *fontFeatureSettings = @{ NSFontFeatureTypeIdentifierKey: @(kNumberSpacingType),
-				                                   NSFontFeatureSelectorIdentifierKey: @(kMonospacedNumbersSelector) };
-
-			NSDictionary *fontFeatureAttributes = @{ NSFontFeatureSettingsAttribute: @[fontFeatureSettings] };
-
-			fontDesc = [fontDesc fontDescriptorByAddingAttributes:fontFeatureAttributes];
-
-			NSFont *font = [NSFont fontWithDescriptor:fontDesc size:fontSize];
+			NSFont *font = [NSFont monospacedDigitSystemFontOfSize:fontSize weight:NSFontWeightRegular];
 
 			cellView.textField.font = font;
 			cellView.textField.stringValue = cellText;
diff --git a/Window/TimeField.m b/Window/TimeField.m
index 9b6cfc4d1..e808d844c 100644
--- a/Window/TimeField.m
+++ b/Window/TimeField.m
@@ -29,16 +29,7 @@ NSString *formatTimer(long minutes, long seconds, unichar prefix, int padding) {
 
 	showTimeRemaining = [[NSUserDefaults standardUserDefaults] boolForKey:kTimerModeKey];
 
-	NSFontDescriptor *fontDesc = [[NSFont systemFontOfSize:fontSize] fontDescriptor];
-
-	NSDictionary *fontFeatureSettings = @{ NSFontFeatureTypeIdentifierKey: @(kNumberSpacingType),
-		                                   NSFontFeatureSelectorIdentifierKey: @(kMonospacedNumbersSelector) };
-
-	NSDictionary *fontFeatureAttributes = @{ NSFontFeatureSettingsAttribute: @[fontFeatureSettings] };
-
-	fontDesc = [fontDesc fontDescriptorByAddingAttributes:fontFeatureAttributes];
-
-	NSFont *font = [NSFont fontWithDescriptor:fontDesc size:fontSize];
+	NSFont *font = [NSFont monospacedDigitSystemFontOfSize:fontSize weight:NSFontWeightRegular];
 
 	fontAttributes = @{ NSFontAttributeName: font };