diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index 1752e1dc824..6c113ad3049 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -1877,6 +1877,15 @@ public void handleFontSizeChange(int change) {
     PreferencesData.set("editor.font", StringUtils.join(pieces, ','));
     getEditors().forEach(Editor::applyPreferences);
   }
+  
+  public void toggleLineNumber() {
+    if (PreferencesData.getBoolean("editor.linenumbers")) {
+      PreferencesData.setBoolean("editor.linenumbers", false);
+    } else {
+      PreferencesData.setBoolean("editor.linenumbers", true);
+    }
+    getEditors().forEach(Editor::applyPreferences);
+  }
 
   public List<JMenu> getBoardsCustomMenus() {
     return boardsCustomMenus;
diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 99e53e488dc..1ade6e969f3 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -1392,7 +1392,14 @@ public void actionPerformed(ActionEvent e) {
     menu.add(decreaseFontSizeItem);
 
     menu.addSeparator();
-
+    
+    JMenuItem toggleLineNumber = newJMenuItemShift(tr("Toggle Line Numbers"), 'L');
+    toggleLineNumber.addActionListener(new ActionListener() {
+      public void actionPerformed(ActionEvent e) {
+        base.toggleLineNumber();
+      }
+    })
+    
     JMenuItem findItem = newJMenuItem(tr("Find..."), 'F');
     findItem.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {