diff --git a/bazarr/main.py b/bazarr/main.py
index 178bf300e..43eb39982 100644
--- a/bazarr/main.py
+++ b/bazarr/main.py
@@ -324,7 +324,7 @@ def series():
     c.execute("SELECT table_shows.sonarrSeriesId, COUNT(table_episodes.missing_subtitles) FROM table_shows LEFT JOIN table_episodes ON table_shows.sonarrSeriesId=table_episodes.sonarrSeriesId WHERE table_shows.languages IS NOT 'None' GROUP BY table_shows.sonarrSeriesId")
     total_subtitles_list = c.fetchall()
     c.close()
-    output = template('series', __file__=__file__, bazarr_version=bazarr_version, rows=data, missing_subtitles_list=missing_subtitles_list, total_subtitles_list=total_subtitles_list, languages=languages, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, single_language=single_language, page_size=page_size)
+    output = template('series', __file__=__file__, bazarr_version=bazarr_version, rows=data, missing_subtitles_list=missing_subtitles_list, total_subtitles_list=total_subtitles_list, languages=languages, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, single_language=single_language, page_size=page_size, current_port=port)
     return output
 
 @route(base_url + 'serieseditor')
@@ -346,7 +346,7 @@ def serieseditor():
     c.execute("SELECT code2, name FROM table_settings_languages WHERE enabled = 1")
     languages = c.fetchall()
     c.close()
-    output = template('serieseditor', __file__=__file__, bazarr_version=bazarr_version, rows=data, languages=languages, missing_count=missing_count, base_url=base_url, single_language=single_language)
+    output = template('serieseditor', __file__=__file__, bazarr_version=bazarr_version, rows=data, languages=languages, missing_count=missing_count, base_url=base_url, single_language=single_language, current_port=port)
     return output
 
 
@@ -471,7 +471,7 @@ def episodes(no):
     for key, season in itertools.groupby(episodes,operator.itemgetter(2)):
         seasons_list.append(list(season))
 
-    return template('episodes', __file__=__file__, bazarr_version=bazarr_version, no=no, details=series_details, languages=languages, seasons=seasons_list, url_sonarr_short=url_sonarr_short, base_url=base_url, tvdbid=tvdbid, number=number)
+    return template('episodes', __file__=__file__, bazarr_version=bazarr_version, no=no, details=series_details, languages=languages, seasons=seasons_list, url_sonarr_short=url_sonarr_short, base_url=base_url, tvdbid=tvdbid, number=number, current_port=port)
 
 @route(base_url + 'movies')
 @custom_auth_basic(check_credentials)
@@ -498,7 +498,7 @@ def movies():
     c.execute("SELECT code2, name FROM table_settings_languages WHERE enabled = 1")
     languages = c.fetchall()
     c.close()
-    output = template('movies', __file__=__file__, bazarr_version=bazarr_version, rows=data, languages=languages, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, single_language=single_language, page_size=page_size)
+    output = template('movies', __file__=__file__, bazarr_version=bazarr_version, rows=data, languages=languages, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, single_language=single_language, page_size=page_size, current_port=port)
     return output
 
 @route(base_url + 'movieseditor')
@@ -520,7 +520,7 @@ def movieseditor():
     c.execute("SELECT code2, name FROM table_settings_languages WHERE enabled = 1")
     languages = c.fetchall()
     c.close()
-    output = template('movieseditor', __file__=__file__, bazarr_version=bazarr_version, rows=data, languages=languages, missing_count=missing_count, base_url=base_url, single_language=single_language)
+    output = template('movieseditor', __file__=__file__, bazarr_version=bazarr_version, rows=data, languages=languages, missing_count=missing_count, base_url=base_url, single_language=single_language, current_port=port)
     return output
 
 @route(base_url + 'edit_movieseditor', method='POST')
@@ -605,7 +605,7 @@ def movie(no):
     languages = c.execute("SELECT code2, name FROM table_settings_languages WHERE enabled = 1").fetchall()
     c.close()
 
-    return template('movie', __file__=__file__, bazarr_version=bazarr_version, no=no, details=movies_details, languages=languages, url_radarr_short=url_radarr_short, base_url=base_url, tmdbid=tmdbid)
+    return template('movie', __file__=__file__, bazarr_version=bazarr_version, no=no, details=movies_details, languages=languages, url_radarr_short=url_radarr_short, base_url=base_url, tmdbid=tmdbid, current_port=port)
 
 @route(base_url + 'scan_disk/<no:int>', method='GET')
 @custom_auth_basic(check_credentials)
@@ -651,7 +651,7 @@ def search_missing_subtitles_movie(no):
 @custom_auth_basic(check_credentials)
 def history():
     authorize()
-    return template('history', __file__=__file__, bazarr_version=bazarr_version, base_url=base_url)
+    return template('history', __file__=__file__, bazarr_version=bazarr_version, base_url=base_url, current_port=port)
 
 @route(base_url + 'historyseries')
 @custom_auth_basic(check_credentials)
@@ -689,7 +689,7 @@ def historyseries():
     data = c.fetchall()
     c.close()
     data = reversed(sorted(data, key=operator.itemgetter(4)))
-    return template('historyseries', __file__=__file__, bazarr_version=bazarr_version, rows=data, row_count=row_count, page=page, max_page=max_page, stats=stats, base_url=base_url, page_size=page_size)
+    return template('historyseries', __file__=__file__, bazarr_version=bazarr_version, rows=data, row_count=row_count, page=page, max_page=max_page, stats=stats, base_url=base_url, page_size=page_size, current_port=port)
 
 @route(base_url + 'historymovies')
 @custom_auth_basic(check_credentials)
@@ -727,13 +727,13 @@ def historymovies():
     data = c.fetchall()
     c.close()
     data = reversed(sorted(data, key=operator.itemgetter(2)))
-    return template('historymovies', __file__=__file__, bazarr_version=bazarr_version, rows=data, row_count=row_count, page=page, max_page=max_page, stats=stats, base_url=base_url, page_size=page_size)
+    return template('historymovies', __file__=__file__, bazarr_version=bazarr_version, rows=data, row_count=row_count, page=page, max_page=max_page, stats=stats, base_url=base_url, page_size=page_size, current_port=port)
 
 @route(base_url + 'wanted')
 @custom_auth_basic(check_credentials)
 def wanted():
     authorize()
-    return template('wanted', __file__=__file__, bazarr_version=bazarr_version, base_url=base_url)
+    return template('wanted', __file__=__file__, bazarr_version=bazarr_version, base_url=base_url, current_port=port)
 
 @route(base_url + 'wantedseries')
 @custom_auth_basic(check_credentials)
@@ -761,7 +761,7 @@ def wantedseries():
     c.execute("SELECT table_shows.title, table_episodes.season || 'x' || table_episodes.episode, table_episodes.title, table_episodes.missing_subtitles, table_episodes.sonarrSeriesId, path_substitution(table_episodes.path), table_shows.hearing_impaired, table_episodes.sonarrEpisodeId, table_episodes.scene_name FROM table_episodes INNER JOIN table_shows on table_shows.sonarrSeriesId = table_episodes.sonarrSeriesId WHERE table_episodes.missing_subtitles != '[]'" + monitored_only_query_string + " ORDER BY table_episodes._rowid_ DESC LIMIT ? OFFSET ?", (page_size, offset,))
     data = c.fetchall()
     c.close()
-    return template('wantedseries', __file__=__file__, bazarr_version=bazarr_version, rows=data, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, page_size=page_size)
+    return template('wantedseries', __file__=__file__, bazarr_version=bazarr_version, rows=data, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, page_size=page_size, current_port=port)
 
 @route(base_url + 'wantedmovies')
 @custom_auth_basic(check_credentials)
@@ -789,7 +789,7 @@ def wantedmovies():
     c.execute("SELECT title, missing_subtitles, radarrId, path_substitution(path), hearing_impaired, sceneName FROM table_movies WHERE missing_subtitles != '[]'" + monitored_only_query_string + " ORDER BY _rowid_ DESC LIMIT ? OFFSET ?", (page_size, offset,))
     data = c.fetchall()
     c.close()
-    return template('wantedmovies', __file__=__file__, bazarr_version=bazarr_version, rows=data, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, page_size=page_size)
+    return template('wantedmovies', __file__=__file__, bazarr_version=bazarr_version, rows=data, missing_count=missing_count, page=page, max_page=max_page, base_url=base_url, page_size=page_size, current_port=port)
 
 @route(base_url + 'wanted_search_missing_subtitles')
 @custom_auth_basic(check_credentials)
@@ -822,7 +822,7 @@ def settings():
     settings_sonarr = get_sonarr_settings()
     settings_radarr = get_radarr_settings()
 
-    return template('settings', __file__=__file__, bazarr_version=bazarr_version, settings_general=settings_general, settings_proxy=settings_proxy, settings_auth=settings_auth, settings_languages=settings_languages, settings_providers=settings_providers, settings_sonarr=settings_sonarr, settings_radarr=settings_radarr, settings_notifier=settings_notifier, base_url=base_url)
+    return template('settings', __file__=__file__, bazarr_version=bazarr_version, settings_general=settings_general, settings_proxy=settings_proxy, settings_auth=settings_auth, settings_languages=settings_languages, settings_providers=settings_providers, settings_sonarr=settings_sonarr, settings_radarr=settings_radarr, settings_notifier=settings_notifier, base_url=base_url, current_port=port)
 
 @route(base_url + 'save_settings', method='POST')
 @custom_auth_basic(check_credentials)
@@ -1435,7 +1435,7 @@ def system():
         for release in r.json():
             releases.append([release['name'],release['body']])
 
-    return template('system', __file__=__file__, bazarr_version=bazarr_version, base_url=base_url, task_list=task_list, row_count=row_count, max_page=max_page, page_size=page_size, releases=releases)
+    return template('system', __file__=__file__, bazarr_version=bazarr_version, base_url=base_url, task_list=task_list, row_count=row_count, max_page=max_page, page_size=page_size, releases=releases, current_port=port)
 
 @route(base_url + 'logs/<page:int>')
 @custom_auth_basic(check_credentials)
@@ -1449,7 +1449,7 @@ def get_logs(page):
         logs_complete.append(line.rstrip())
     logs = logs_complete[begin:end]
 
-    return template('logs', logs=logs, base_url=base_url)
+    return template('logs', logs=logs, base_url=base_url, current_port=port)
 
 @route(base_url + 'execute/<taskid>')
 @custom_auth_basic(check_credentials)
diff --git a/views/history.tpl b/views/history.tpl
index b4916a2b3..cdabe9b15 100644
--- a/views/history.tpl
+++ b/views/history.tpl
@@ -46,7 +46,7 @@
 	</head>
 	<body>
 		<div id='loader' class="ui page dimmer">
-		   	<div class="ui indeterminate text loader">Loading...</div>
+		   	<div id="loader_text" class="ui indeterminate text loader">Loading...</div>
 		</div>
 		% include('menu.tpl')
 
diff --git a/views/historymovies.tpl b/views/historymovies.tpl
index 0221e74be..e25b537e7 100644
--- a/views/historymovies.tpl
+++ b/views/historymovies.tpl
@@ -47,7 +47,7 @@
 	</head>
 	<body>
 		<div id='loader' class="ui page dimmer">
-		   	<div class="ui indeterminate text loader">Loading...</div>
+		   	<div id="loader_text" class="ui indeterminate text loader">Loading...</div>
 		</div>
 
 		<div class="ui container">
diff --git a/views/historyseries.tpl b/views/historyseries.tpl
index e6c7880ee..0542f9ba2 100644
--- a/views/historyseries.tpl
+++ b/views/historyseries.tpl
@@ -47,7 +47,7 @@
 	</head>
 	<body>
 		<div id='loader' class="ui page dimmer">
-		   	<div class="ui indeterminate text loader">Loading...</div>
+		   	<div id="loader_text" class="ui indeterminate text loader">Loading...</div>
 		</div>
 
 		<div class="ui container">
diff --git a/views/logs.tpl b/views/logs.tpl
index ada48b4ce..ea8fe473f 100644
--- a/views/logs.tpl
+++ b/views/logs.tpl
@@ -14,7 +14,7 @@
 	</head>
 	<body>
 		<div id='logs_loader' class="ui page dimmer">
-		   	<div class="ui indeterminate text loader">Loading...</div>
+		   	<div id="loader_text" class="ui indeterminate text loader">Loading...</div>
 		</div>
 		<div class="content">
 			<table class="ui very basic selectable table">
diff --git a/views/menu.tpl b/views/menu.tpl
index 42b0efc0e..997b1a452 100644
--- a/views/menu.tpl
+++ b/views/menu.tpl
@@ -192,11 +192,17 @@
 
 	protocol = window.location.protocol;
 
+	if (window.location.port == '{{current_port}}') {
+	    public_port = '{{port}}';
+    } else {
+        public_port = window.location.port;
+    }
+
 	function ping() {
 		$.ajax({
-			url: protocol + '//' + public_ip + ':{{port}}{{base_url}}',
+			url: protocol + '//' + public_ip + ':' + public_port + '{{base_url}}',
 			success: function(result) {
-				window.location.href= protocol + '//' + public_ip + ':{{port}}{{base_url}}';
+				window.location.href= protocol + '//' + public_ip + ':' + public_port + '{{base_url}}';
 			}
 		});
 	}
diff --git a/views/movies.tpl b/views/movies.tpl
index 058c36d2c..3a321fbb7 100644
--- a/views/movies.tpl
+++ b/views/movies.tpl
@@ -45,7 +45,7 @@
 	</head>
 	<body>
 		<div id='loader' class="ui page dimmer">
-			<div class="ui indeterminate text loader">Loading...</div>
+			<div id="loader_text" class="ui indeterminate text loader">Loading...</div>
 		</div>
 		% include('menu.tpl')
 
diff --git a/views/movieseditor.tpl b/views/movieseditor.tpl
index bc3e96f98..7a51b55a9 100644
--- a/views/movieseditor.tpl
+++ b/views/movieseditor.tpl
@@ -49,7 +49,7 @@
 	</head>
 	<body>
 		<div id='loader' class="ui page dimmer">
-			<div class="ui indeterminate text loader">Loading...</div>
+			<div id="loader_text" class="ui indeterminate text loader">Loading...</div>
 		</div>
 		% include('menu.tpl')
 
diff --git a/views/series.tpl b/views/series.tpl
index 5c9a5fd63..8aad09843 100644
--- a/views/series.tpl
+++ b/views/series.tpl
@@ -45,7 +45,7 @@
 	</head>
 	<body>
 		<div id='loader' class="ui page dimmer">
-			<div class="ui indeterminate text loader">Loading...</div>
+			<div id="loader_text" class="ui indeterminate text loader">Loading...</div>
 		</div>
 		% include('menu.tpl')
 
diff --git a/views/serieseditor.tpl b/views/serieseditor.tpl
index cfc311db1..2b9d867e3 100644
--- a/views/serieseditor.tpl
+++ b/views/serieseditor.tpl
@@ -49,7 +49,7 @@
 	</head>
 	<body>
 		<div id='loader' class="ui page dimmer">
-			<div class="ui indeterminate text loader">Loading...</div>
+			<div id="loader_text" class="ui indeterminate text loader">Loading...</div>
 		</div>
 		% include('menu.tpl')
 
diff --git a/views/settings.tpl b/views/settings.tpl
index 1648fc06e..b698ce56b 100644
--- a/views/settings.tpl
+++ b/views/settings.tpl
@@ -37,7 +37,7 @@
     </head>
     <body>
         <div id='loader' class="ui page dimmer">
-            <div class="ui indeterminate text loader">Loading...</div>
+            <div id="loader_text" class="ui indeterminate text loader">Loading...</div>
         </div>
         % include('menu.tpl')
 
diff --git a/views/system.tpl b/views/system.tpl
index c92bc9e97..a2882b14c 100644
--- a/views/system.tpl
+++ b/views/system.tpl
@@ -248,11 +248,17 @@
 
 	protocol = window.location.protocol;
 
+	if (window.location.port == '{{current_port}}') {
+	    public_port = '{{port}}';
+    } else {
+        public_port = window.location.port;
+    }
+
 	function ping() {
 		$.ajax({
-			url: protocol + '//' + public_ip + ':{{port}}{{base_url}}',
+			url: protocol + '//' + public_ip + ':' + public_port + '{{base_url}}',
 			success: function(result) {
-				window.location.href= protocol + '//' + public_ip + ':{{port}}{{base_url}}';
+				window.location.href= protocol + '//' + public_ip + ':' + public_port + '{{base_url}}';
 			}
 		});
 	}