diff --git a/notebook/notebookapp.py b/notebook/notebookapp.py
index 28f6496ec..80cc004f2 100755
--- a/notebook/notebookapp.py
+++ b/notebook/notebookapp.py
@@ -759,7 +759,7 @@ class NotebookApp(JupyterApp):
         value = proposal['value']
         if not value.startswith('/'):
             value = '/' + value
-        elif not value.endswith('/'):
+        if not value.endswith('/'):
             value = value + '/'
         return value
     
diff --git a/notebook/static/terminal/js/main.js b/notebook/static/terminal/js/main.js
index f84ab95d5..bfaa23c03 100644
--- a/notebook/static/terminal/js/main.js
+++ b/notebook/static/terminal/js/main.js
@@ -36,7 +36,7 @@ require([
         // 1.02 here arrived at by trial and error to make the spacing look right
     var termColWidth =  function() { return 1.02 * $("#dummy-screen-rows")[0].offsetWidth / 80;};
 
-    var base_url = utils.get_body_data('baseUrl');
+    var base_url = utils.get_body_data('baseUrl').replace(/\/?$/, '/');
     var ws_path = utils.get_body_data('wsPath');
     var ws_url = utils.get_body_data('wsUrl');
     if (!ws_url) {