diff --git a/src/common/user-store/preferences-helpers.ts b/src/common/user-store/preferences-helpers.ts
index eb18667262..89ff048541 100644
--- a/src/common/user-store/preferences-helpers.ts
+++ b/src/common/user-store/preferences-helpers.ts
@@ -10,7 +10,7 @@ import { getAppVersion, ObservableToggleSet } from "../utils";
 import type { editor } from "monaco-editor";
 import merge from "lodash/merge";
 import { SemVer } from "semver";
-import { defaultTheme, defaultFontFamily, defaultFontSize } from "../vars";
+import { defaultTheme, defaultEditorFontFamily, defaultFontSize } from "../vars";
 
 export interface KubeconfigSyncEntry extends KubeconfigSyncValue {
   filePath: string;
@@ -25,8 +25,8 @@ export type EditorConfiguration = Pick<editor.IStandaloneEditorConstructionOptio
 export const defaultEditorConfig: EditorConfiguration = {
   tabSize: 2,
   lineNumbers: "on",
-  fontSize: 12,
-  fontFamily: defaultFontFamily,
+  fontSize: defaultFontSize,
+  fontFamily: defaultEditorFontFamily,
   minimap: {
     enabled: true,
     side: "right",
@@ -194,7 +194,7 @@ const terminalFontSize: PreferenceDescription<number | undefined> = {
   },
   toStore(val) {
     if (!val) {
-      return defaultFontSize;
+      return undefined;
     }
 
     return val;
@@ -207,7 +207,7 @@ const terminalFontFamily: PreferenceDescription<string | undefined> = {
   },
   toStore(val) {
     if (!val) {
-      return defaultFontFamily;
+      return undefined;
     }
 
     return val;
diff --git a/src/common/vars.ts b/src/common/vars.ts
index 4f9abb6034..abbf09e877 100644
--- a/src/common/vars.ts
+++ b/src/common/vars.ts
@@ -26,8 +26,9 @@ export const productName = packageInfo.productName;
 export const appName = `${packageInfo.productName}${isDevelopment ? "Dev" : ""}`;
 export const publicPath = "/build/" as string;
 export const defaultTheme = "lens-dark" as string;
-export const defaultFontSize = 13;
-export const defaultFontFamily = "RobotoMono";
+export const defaultFontSize = 12;
+export const defaultTerminalFontFamily = "RobotoMono";
+export const defaultEditorFontFamily = "RobotoMono";
 
 // Webpack build paths
 export const contextDir = process.cwd();
diff --git a/src/renderer/components/dock/terminal/terminal.ts b/src/renderer/components/dock/terminal/terminal.ts
index 0e9228dc5b..4ccb10f057 100644
--- a/src/renderer/components/dock/terminal/terminal.ts
+++ b/src/renderer/components/dock/terminal/terminal.ts
@@ -11,7 +11,7 @@ import type { DockStore, TabId } from "../dock-store/dock.store";
 import { TerminalApi, TerminalChannels } from "../../../api/terminal-api";
 import { ThemeStore } from "../../../theme.store";
 import { disposer } from "../../../utils";
-import { isMac, defaultFontFamily, defaultFontSize } from "../../../../common/vars";
+import { isMac, defaultTerminalFontFamily, defaultFontSize} from "../../../../common/vars";
 import { once } from "lodash";
 import { UserStore } from "../../../../common/user-store";
 import { clipboard } from "electron";
@@ -38,7 +38,7 @@ export class Terminal {
     cursorBlink: true,
     cursorStyle: "bar",
     fontSize: UserStore.getInstance().terminalFontSize || defaultFontSize,
-    fontFamily: UserStore.getInstance().terminalFontFamily || defaultFontFamily,
+    fontFamily: UserStore.getInstance().terminalFontFamily || defaultTerminalFontFamily,
   });
   private readonly fitAddon = new FitAddon();
   private scrollPos = 0;