diff --git a/data/io.elementary.code.gschema.xml b/data/io.elementary.code.gschema.xml
index f51bd221e..400fe64e4 100644
--- a/data/io.elementary.code.gschema.xml
+++ b/data/io.elementary.code.gschema.xml
@@ -9,6 +9,7 @@
     <value nick="Never" value="0" />
     <value nick="For Selection" value="1" />
     <value nick="Always" value="2" />
+    <value nick="Current" value="4" />
   </enum>
   <enum id="io.elementary.code.case-sensitive-mode">
     <value nick="never" value="0" />
diff --git a/src/Dialogs/PreferencesDialog.vala b/src/Dialogs/PreferencesDialog.vala
index eaacfe922..c3e20ead6 100644
--- a/src/Dialogs/PreferencesDialog.vala
+++ b/src/Dialogs/PreferencesDialog.vala
@@ -132,12 +132,28 @@ namespace Scratch.Dialogs {
             var line_wrap_label = new SettingsLabel (_("Line wrap:"));
             var line_wrap = new SettingsSwitch ("line-wrap");
 
-            var draw_spaces_label = new SettingsLabel (_("Visible whitespace:"));
-            var draw_spaces_switch = new DrawSpacesSwitch () {
-                halign = Gtk.Align.START,
-                valign = Gtk.Align.CENTER
-            };
+            var draw_spaces_label = new SettingsLabel (_("White space visible when not selected:"));
 
+            var drawspaces_combobox = new Gtk.ComboBoxText () {
+                hexpand = true
+            };
+            drawspaces_combobox.append_text (_("None"));
+            drawspaces_combobox.append_text (_("Current Line"));
+            drawspaces_combobox.append_text (_("All"));
+            drawspaces_combobox.active = Scratch.settings.get_enum ("draw-spaces").clamp (0, 2);
+            drawspaces_combobox.changed.connect (() => {
+                switch (drawspaces_combobox.active) {
+                    case 0:
+                        Scratch.settings.set_enum ("draw-spaces", (int)ScratchDrawSpacesState.NEVER);
+                        break;
+                    case 1:
+                        Scratch.settings.set_enum ("draw-spaces", (int)ScratchDrawSpacesState.CURRENT);
+                        break;
+                    case 2:
+                        Scratch.settings.set_enum ("draw-spaces", (int)ScratchDrawSpacesState.ALWAYS);
+                        break;
+                }
+            });
             var show_mini_map_label = new SettingsLabel (_("Show Mini Map:"));
             show_mini_map = new SettingsSwitch ("show-mini-map");
 
@@ -168,7 +184,7 @@ namespace Scratch.Dialogs {
             content.attach (line_wrap_label, 0, 3, 1, 1);
             content.attach (line_wrap, 1, 3, 1, 1);
             content.attach (draw_spaces_label, 0, 4, 1, 1);
-            content.attach (draw_spaces_switch, 1, 4, 2, 1);
+            content.attach (drawspaces_combobox, 1, 4, 2, 1);
             content.attach (show_mini_map_label, 0, 5, 1, 1);
             content.attach (show_mini_map, 1, 5, 1, 1);
             content.attach (show_right_margin_label, 0, 6, 1, 1);
@@ -197,25 +213,5 @@ namespace Scratch.Dialogs {
                 Scratch.settings.bind (setting, this, "active", SettingsBindFlags.DEFAULT);
             }
         }
-
-        private class DrawSpacesSwitch : Gtk.Switch {
-            public string string_value {
-                get {
-                    return active ? "Always" : "For Selection";
-                }
-                set {
-                    active = (value == "Always");
-                }
-            }
-
-            public DrawSpacesSwitch () {
-                halign = Gtk.Align.START;
-                valign = Gtk.Align.CENTER;
-                notify["active"].connect (() => {
-                    string_value = active ? "Always" : "For Selection";
-                });
-                Scratch.settings.bind ("draw-spaces", this, "string_value", SettingsBindFlags.DEFAULT);
-            }
-        }
     }
 }
diff --git a/src/Services/Settings.vala b/src/Services/Settings.vala
index 248780de5..be059dda7 100644
--- a/src/Services/Settings.vala
+++ b/src/Services/Settings.vala
@@ -30,6 +30,7 @@ namespace Scratch {
     public enum ScratchDrawSpacesState {
         NEVER = 0,
         FOR_SELECTION = 1,
-        ALWAYS = 2
+        ALWAYS = 2,
+        CURRENT = 4
     }
 }
diff --git a/src/Widgets/SourceView.vala b/src/Widgets/SourceView.vala
index 5589de04f..a9fecd3ed 100644
--- a/src/Widgets/SourceView.vala
+++ b/src/Widgets/SourceView.vala
@@ -119,8 +119,6 @@ namespace Scratch.Widgets {
             source_buffer.tag_table.add (error_tag);
             source_buffer.tag_table.add (warning_tag);
 
-            restore_settings ();
-
             Gtk.drag_dest_add_uri_targets (this);
 
             restore_settings ();
@@ -255,6 +253,7 @@ namespace Scratch.Widgets {
                     );
                     break;
                 case ScratchDrawSpacesState.FOR_SELECTION:
+                case ScratchDrawSpacesState.CURRENT:
                     space_drawer.set_types_for_locations (
                         Gtk.SourceSpaceLocationFlags.ALL,
                         Gtk.SourceSpaceTypeFlags.NONE
@@ -534,13 +533,19 @@ namespace Scratch.Widgets {
 
             Gtk.TextIter start, end;
             var selection = buffer.get_selection_bounds (out start, out end);
-
+            var draw_spaces_state = (ScratchDrawSpacesState) Scratch.settings.get_enum ("draw-spaces");
             /* Draw spaces in selection the same way if drawn at all */
-            if (selection) {
-                var draw_spaces_state = (ScratchDrawSpacesState) Scratch.settings.get_enum ("draw-spaces");
-                if (draw_spaces_state in (ScratchDrawSpacesState.FOR_SELECTION | ScratchDrawSpacesState.ALWAYS)) {
+            if (selection &&
+                draw_spaces_state in (ScratchDrawSpacesState.FOR_SELECTION | ScratchDrawSpacesState.CURRENT | ScratchDrawSpacesState.ALWAYS)) {
+
+                    buffer.apply_tag_by_name ("draw_spaces", start, end);
+                    return;
+            }
+
+            if (draw_spaces_state == ScratchDrawSpacesState.CURRENT &&
+                get_current_line (out start, out end)) {
+
                     buffer.apply_tag_by_name ("draw_spaces", start, end);
-                }
             }
         }