diff --git a/src/Terminal.ts b/src/Terminal.ts
index a8912b3fe..a97eeeed6 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -25,7 +25,7 @@ import { IInputHandlingTerminal, IViewport, ICompositionHelper, ITerminalOptions
 import { IRenderer, CharacterJoinerHandler } from 'browser/renderer/Types';
 import { CompositionHelper } from 'browser/input/CompositionHelper';
 import { Viewport } from './Viewport';
-import { rightClickHandler, moveTextAreaUnderMouseCursor, pasteHandler, copyHandler } from './Clipboard';
+import { rightClickHandler, moveTextAreaUnderMouseCursor, pasteHandler, copyHandler } from './browser/Clipboard';
 import { C0 } from 'common/data/EscapeSequences';
 import { InputHandler } from './InputHandler';
 import { Renderer } from './renderer/Renderer';
diff --git a/src/Clipboard.test.ts b/src/browser/Clipboard.test.ts
similarity index 95%
rename from src/Clipboard.test.ts
rename to src/browser/Clipboard.test.ts
index 07c0f66e8..aa7bdabdd 100644
--- a/src/Clipboard.test.ts
+++ b/src/browser/Clipboard.test.ts
@@ -4,7 +4,7 @@
  */
 
 import { assert } from 'chai';
-import * as Clipboard from './Clipboard';
+import * as Clipboard from 'browser/Clipboard';
 
 describe('evaluatePastedTextProcessing', () => {
   it('should replace carriage return and/or line feed with carriage return', () => {
diff --git a/src/Clipboard.ts b/src/browser/Clipboard.ts
similarity index 97%
rename from src/Clipboard.ts
rename to src/browser/Clipboard.ts
index f4b415deb..f56868ccc 100644
--- a/src/Clipboard.ts
+++ b/src/browser/Clipboard.ts
@@ -29,7 +29,9 @@ export function bracketTextForPaste(text: string, bracketedPasteMode: boolean):
  * @param ev The original copy event to be handled
  */
 export function copyHandler(ev: ClipboardEvent, selectionService: ISelectionService): void {
-  ev.clipboardData.setData('text/plain', selectionService.selectionText);
+  if (ev.clipboardData) {
+    ev.clipboardData.setData('text/plain', selectionService.selectionText);
+  }
   // Prevent or the original text will be copied.
   ev.preventDefault();
 }