From 5720dac80375d256af8191b5aa7565ba0101dc82 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 23 May 2016 13:03:31 +0300
Subject: [PATCH] #4175, #4298

---
 public/src/admin/admin.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/public/src/admin/admin.js b/public/src/admin/admin.js
index d5a5e1f8d3..fc54067d3a 100644
--- a/public/src/admin/admin.js
+++ b/public/src/admin/admin.js
@@ -2,13 +2,20 @@
 /*global config, translator, componentHandler, define, socket, app, ajaxify, utils, bootbox, Slideout, RELATIVE_PATH*/
 
 (function() {
-	$(document).ready(function() {
-		setupKeybindings();
 
-		// on page reload show correct tab if url has #
+	$(window).on('action:ajaxify.end', function() {
+		showCorrectNavTab();
+	});
+
+	function showCorrectNavTab() {
+		// show correct tab if url has #
 		if (window.location.hash) {
 			$('.nav-pills a[href=' + window.location.hash + ']').tab('show');
 		}
+	}
+
+	$(document).ready(function() {
+		setupKeybindings();
 
 		if(!/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent)) {
 			require(['admin/modules/search'], function(search) {