diff --git a/src/SelectionManager.ts b/src/SelectionManager.ts
index 48a2fec8..56d32b56 100644
--- a/src/SelectionManager.ts
+++ b/src/SelectionManager.ts
@@ -14,7 +14,7 @@ import { EventEmitter, IEvent } from 'common/EventEmitter';
 import { ICharSizeService, IMouseService } from 'browser/services/Services';
 import { IBufferService, IOptionsService } from 'common/services/Services';
 import { getCoordsRelativeToElement } from 'browser/input/Mouse';
-import { moveToCellSequence } from 'handlers/AltClickHandler';
+import { moveToCellSequence } from 'browser/input/MoveToCell';
 
 /**
  * The number of pixels the mouse needs to be above or below the viewport in
diff --git a/src/handlers/AltClickHandler.ts b/src/browser/input/MoveToCell.ts
similarity index 96%
rename from src/handlers/AltClickHandler.ts
rename to src/browser/input/MoveToCell.ts
index 73e9b729..406ec807 100644
--- a/src/handlers/AltClickHandler.ts
+++ b/src/browser/input/MoveToCell.ts
@@ -101,8 +101,8 @@ function wrappedRowsCount(startY: number, targetY: number, bufferService: IBuffe
 
   for (let i = 0; i < Math.abs(startRow - endRow); i++) {
     const direction = verticalDirection(startY, targetY) === Direction.UP ? -1 : 1;
-
-    if (bufferService.buffer.lines.get(startRow + (direction * i)).isWrapped) {
+    const line = bufferService.buffer.lines.get(startRow + (direction * i));
+    if (line && line.isWrapped) {
       wrappedRows++;
     }
   }
@@ -116,12 +116,13 @@ function wrappedRowsCount(startY: number, targetY: number, bufferService: IBuffe
  */
 function wrappedRowsForRow(bufferService: IBufferService, currentRow: number): number {
   let rowCount = 0;
-  let lineWraps = bufferService.buffer.lines.get(currentRow).isWrapped;
+  let line = bufferService.buffer.lines.get(currentRow);
+  let lineWraps = line && line.isWrapped;
 
   while (lineWraps && currentRow >= 0 && currentRow < bufferService.rows) {
     rowCount++;
-    currentRow--;
-    lineWraps = bufferService.buffer.lines.get(currentRow).isWrapped;
+    line = bufferService.buffer.lines.get(--currentRow);
+    lineWraps = line && line.isWrapped;
   }
 
   return rowCount;