diff --git a/static/js/pad2.js b/static/js/pad2.js
index fa3504483..50bd9459d 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -60,7 +60,11 @@ function randomString() {
 
 function handshake()
 {
-  socket = new io.Socket();
+  var host = window.location.hostname;
+  var options = {secure: window.location.protocol == 'https:',
+                 port: window.location.port};
+
+  socket = new io.Socket(host, options);
   socket.connect();
 
   socket.on('connect', function(){