diff --git a/www/assets/app.js b/www/assets/app.js
index a7a27dd..5f2300d 100644
--- a/www/assets/app.js
+++ b/www/assets/app.js
@@ -204,9 +204,11 @@
           });
 
           term.open(terminalContainer);
-          term.fit();
-
-          $scope.resize(term.proposeGeometry());
+          
+          // Set geometry during the next tick, to avoid race conditions.
+          setTimeout(function() {
+              $scope.resize(term.proposeGeometry());
+          }, 4);
 
           term.on('data', function(d) {
             $scope.socket.emit('terminal in', instance.name, d);