diff --git a/lib/repl.js b/lib/repl.js
index 8619486e89c711..a0ff3b91451d74 100644
--- a/lib/repl.js
+++ b/lib/repl.js
@@ -701,6 +701,11 @@ function REPLServer(prompt,
       return;
     }
     if (!self.editorMode || !self.terminal) {
+      // Before exiting, make sure to clear the line.
+      if (key.ctrl && key.name === 'd' &&
+          self.cursor === 0 && self.line.length === 0) {
+        self.clearLine();
+      }
       ttyWrite(d, key);
       return;
     }
diff --git a/test/parallel/test-repl-save-load.js b/test/parallel/test-repl-save-load.js
index 2767c0f02629be..7d6f28548f7056 100644
--- a/test/parallel/test-repl-save-load.js
+++ b/test/parallel/test-repl-save-load.js
@@ -70,7 +70,7 @@ assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'),
   putIn.run([`.save ${saveFileName}`]);
   replServer.close();
   assert.strictEqual(fs.readFileSync(saveFileName, 'utf8'),
-                     `${cmds.join('\n')}\n`);
+                     `${cmds.join('\n')}\n\n`);
 }
 
 // make sure that the REPL data is "correct"