diff --git a/src/Main.ts b/src/Main.ts
index 11f3f99cd..d4f3a169b 100755
--- a/src/Main.ts
+++ b/src/Main.ts
@@ -90,11 +90,7 @@ function main(): void {
   let failed = false;
 
   app.commandLine.appendSwitch('disable-smooth-scrolling'); // Turn off the sluggish scrolling.
-
-  // Turn off the HiDPI automatic UI scaling. It actually causes a rendering glitch in the
-  // tab in the atomic light theme.
   app.commandLine.appendSwitch('high-dpi-support', 'true');
-  app.commandLine.appendSwitch('force-device-scale-factor', '1');
 
   if (process.platform === "darwin") {
     setupOSX();
diff --git a/src/VirtualScrollArea.ts b/src/VirtualScrollArea.ts
index 7d64f3ae1..6668568a7 100644
--- a/src/VirtualScrollArea.ts
+++ b/src/VirtualScrollArea.ts
@@ -511,8 +511,9 @@ export class VirtualScrollArea {
     const newState = _.clone(this._currentState);
     newState.scrollableStates = this._currentState.scrollableStates.map<VirtualScrollableState>(_.clone.bind(_));
 
-    const virtualHeight = TotalVirtualHeight(this._currentState);
-    const isAtBottom = this._currentState.virtualScrollYOffset >= virtualHeight - this._currentState.containerHeight;
+    const virtualHeight = TotalVirtualHeight(this._currentState);   
+    const TOLERANCE = 4;
+    const isAtBottom = (this._currentState.virtualScrollYOffset + TOLERANCE) >= virtualHeight - this._currentState.containerHeight;
     
     for (let i=0; i<mutator.length; i++) {
       mutator[i](newState);