diff --git a/auto/gui.files.go b/auto/gui.files.go
index 242b80fc9..ae76e06ce 100644
--- a/auto/gui.files.go
+++ b/auto/gui.files.go
@@ -27,7 +27,7 @@ func Assets() map[string][]byte {
 	bs, _ = ioutil.ReadAll(gr)
 	assets["angular/angular.min.js"] = bs
 
-	bs, _ = base64.StdEncoding.DecodeString("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")
+	bs, _ = base64.StdEncoding.DecodeString("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")
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	assets["app.js"] = bs
diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go
index d95bd64d4..a3a47b3ac 100644
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -52,33 +52,28 @@ func init() {
 }
 
 func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) error {
-	var listener net.Listener
 	var err error
-	if cfg.UseTLS {
-		cert, err := loadCert(confDir, "https-")
-		if err != nil {
-			l.Infoln("Loading HTTPS certificate:", err)
-			l.Infoln("Creating new HTTPS certificate")
-			newCertificate(confDir, "https-")
-			cert, err = loadCert(confDir, "https-")
-		}
-		if err != nil {
-			return err
-		}
-		tlsCfg := &tls.Config{
-			Certificates: []tls.Certificate{cert},
-			ServerName:   "syncthing",
-		}
-		listener, err = tls.Listen("tcp", cfg.Address, tlsCfg)
-		if err != nil {
-			return err
-		}
-	} else {
-		listener, err = net.Listen("tcp", cfg.Address)
-		if err != nil {
-			return err
-		}
+
+	cert, err := loadCert(confDir, "https-")
+	if err != nil {
+		l.Infoln("Loading HTTPS certificate:", err)
+		l.Infoln("Creating new HTTPS certificate")
+		newCertificate(confDir, "https-")
+		cert, err = loadCert(confDir, "https-")
 	}
+	if err != nil {
+		return err
+	}
+	tlsCfg := &tls.Config{
+		Certificates: []tls.Certificate{cert},
+		ServerName:   "syncthing",
+	}
+
+	rawListener, err := net.Listen("tcp", cfg.Address)
+	if err != nil {
+		return err
+	}
+	listener := &DowngradingListener{rawListener, tlsCfg}
 
 	// The GET handlers
 	getRestMux := http.NewServeMux()
@@ -140,6 +135,11 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 		handler = basicAuthAndSessionMiddleware(cfg, handler)
 	}
 
+	// Redirect to HTTPS if we are supposed to
+	if cfg.UseTLS {
+		handler = redirectToHTTPSMiddleware(handler)
+	}
+
 	go http.Serve(listener, handler)
 	return nil
 }
@@ -157,6 +157,23 @@ func getPostHandler(get, post http.Handler) http.Handler {
 	})
 }
 
+func redirectToHTTPSMiddleware(h http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Add a generous access-control-allow-origin header since we may be
+		// redirecting REST requests over protocols
+		w.Header().Add("Access-Control-Allow-Origin", "*")
+
+		if r.TLS == nil {
+			// Redirect HTTP requests to HTTPS
+			r.URL.Host = r.Host
+			r.URL.Scheme = "https"
+			http.Redirect(w, r, r.URL.String(), http.StatusFound)
+		} else {
+			h.ServeHTTP(w, r)
+		}
+	})
+}
+
 func noCacheMiddleware(h http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Cache-Control", "no-cache")
diff --git a/cmd/syncthing/tls.go b/cmd/syncthing/tls.go
index e46e8079e..7a4150669 100644
--- a/cmd/syncthing/tls.go
+++ b/cmd/syncthing/tls.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+	"bufio"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/sha256"
@@ -13,8 +14,10 @@ import (
 	"crypto/x509/pkix"
 	"encoding/binary"
 	"encoding/pem"
+	"io"
 	"math/big"
 	mr "math/rand"
+	"net"
 	"os"
 	"path/filepath"
 	"time"
@@ -73,3 +76,40 @@ func newCertificate(dir string, prefix string) {
 	pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
 	keyOut.Close()
 }
+
+type DowngradingListener struct {
+	net.Listener
+	TLSConfig *tls.Config
+}
+
+type WrappedConnection struct {
+	io.Reader
+	net.Conn
+}
+
+func (l *DowngradingListener) Accept() (net.Conn, error) {
+	conn, err := l.Listener.Accept()
+	if err != nil {
+		return nil, err
+	}
+
+	br := bufio.NewReader(conn)
+	bs, err := br.Peek(1)
+	if err != nil {
+		conn.Close()
+		return nil, err
+	}
+
+	wrapper := &WrappedConnection{br, conn}
+
+	// 0x16 is the first byte of a TLS handshake
+	if bs[0] == 0x16 {
+		return tls.Server(wrapper, l.TLSConfig), nil
+	}
+
+	return wrapper, nil
+}
+
+func (c *WrappedConnection) Read(b []byte) (n int, err error) {
+	return c.Reader.Read(b)
+}
diff --git a/gui/app.js b/gui/app.js
index 4c7e0717c..9fa0b871d 100644
--- a/gui/app.js
+++ b/gui/app.js
@@ -153,13 +153,17 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
             return;
         }
 
-        console.log('UIOnline');
-        $scope.init();
-        online = true;
-        restarting = false;
-        $('#networkError').modal('hide');
-        $('#restarting').modal('hide');
-        $('#shutdown').modal('hide');
+        if (restarting){
+            document.location.reload(true);
+        } else {
+            console.log('UIOnline');
+            $scope.init();
+            online = true;
+            restarting = false;
+            $('#networkError').modal('hide');
+            $('#restarting').modal('hide');
+            $('#shutdown').modal('hide');
+        }
     });
 
     $scope.$on('UIOffline', function (event, arg) {
@@ -585,7 +589,7 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
 
             setTimeout(function(){
                 window.location.protocol = protocol;
-            }, 1000);
+            }, 2500);
 
             $scope.protocolChanged = false;
         }