diff --git a/CodeEdit/Features/TerminalEmulator/TerminalEmulatorView.swift b/CodeEdit/Features/TerminalEmulator/TerminalEmulatorView.swift
index 1301b3b2e3..3ee5b3f7a8 100644
--- a/CodeEdit/Features/TerminalEmulator/TerminalEmulatorView.swift
+++ b/CodeEdit/Features/TerminalEmulator/TerminalEmulatorView.swift
@@ -31,7 +31,7 @@ struct TerminalEmulatorView: NSViewRepresentable {
 
     private var font: NSFont {
         if !prefs.preferences.terminal.font.customFont {
-            return systemFont
+            return systemFont.withSize(CGFloat(prefs.preferences.terminal.font.size))
         }
         return NSFont(
             name: prefs.preferences.terminal.font.name,
diff --git a/CodeEdit/Features/WindowCommands/ViewCommands.swift b/CodeEdit/Features/WindowCommands/ViewCommands.swift
index 0a5cd954bc..df6ddeb988 100644
--- a/CodeEdit/Features/WindowCommands/ViewCommands.swift
+++ b/CodeEdit/Features/WindowCommands/ViewCommands.swift
@@ -8,9 +8,14 @@
 import SwiftUI
 
 struct ViewCommands: Commands {
+    @ObservedObject
     private var prefs: AppPreferencesModel = .shared
+
     @State var windowController: CodeEditWindowController?
 
+    private let documentController: CodeEditDocumentController = CodeEditDocumentController()
+    private let statusBarViewModel: StatusBarViewModel = StatusBarViewModel()
+
     var navigatorCollapsed: Bool {
         windowController?.navigatorCollapsed ?? false
     }
@@ -26,14 +31,22 @@ struct ViewCommands: Commands {
             }
             .keyboardShortcut("p", modifiers: [.shift, .command])
 
-            Button("Zoom in") {
-                prefs.preferences.textEditing.font.size += 1
+            Button("Increase font size") {
+                if CodeEditDocumentController.shared.documents.count > 1 {
+                    prefs.preferences.textEditing.font.size += 1
+                }
+                prefs.preferences.terminal.font.size += 1
             }
             .keyboardShortcut("+")
 
-            Button("Zoom out") {
-                if !(prefs.preferences.textEditing.font.size <= 1) {
-                    prefs.preferences.textEditing.font.size -= 1
+            Button("Decrease font size") {
+                if CodeEditDocumentController.shared.documents.count > 1 {
+                    if !(prefs.preferences.textEditing.font.size <= 1) {
+                        prefs.preferences.textEditing.font.size -= 1
+                    }
+                }
+                if !(prefs.preferences.terminal.font.size <= 1) {
+                    prefs.preferences.terminal.font.size -= 1
                 }
             }
             .keyboardShortcut("-")