diff --git a/op/op.ExtensionMgr.php b/op/op.ExtensionMgr.php
index 98c81682f..7fcbe569c 100644
--- a/op/op.ExtensionMgr.php
+++ b/op/op.ExtensionMgr.php
@@ -40,6 +40,9 @@ if(!checkFormKey('extensionmgr')) {
 if (isset($_POST["action"])) $action=$_POST["action"];
 else $action=NULL;
 
+if (isset($_POST["currenttab"])) $currenttab=$_POST["currenttab"];
+else $currenttab=NULL;
+
 // add new attribute definition ---------------------------------------------
 if ($action == "download") {
 	if (!isset($_POST["extname"])) {
@@ -66,7 +69,7 @@ elseif ($action == "refresh") { /* {{{ */
 	}
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_refresh')));
 	add_log_line();
-	header("Location:../out/out.ExtensionMgr.php");
+	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
 elseif ($action == "upload") { /* {{{ */
 	if(!$extmgr->isWritableExitDir()) {
@@ -86,7 +89,7 @@ elseif ($action == "upload") { /* {{{ */
 	}
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_import')));
 	add_log_line();
-	header("Location:../out/out.ExtensionMgr.php");
+	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
 elseif ($action == "import") { /* {{{ */
 	if(!$_POST['url']) {
@@ -108,7 +111,7 @@ elseif ($action == "import") { /* {{{ */
 	unlink($file);
 	$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_upload')));
 	add_log_line();
-	header("Location:../out/out.ExtensionMgr.php");
+	header("Location:../out/out.ExtensionMgr.php?currenttab=".$currenttab);
 } /* }}} */
 
 
diff --git a/views/bootstrap/class.ExtensionMgr.php b/views/bootstrap/class.ExtensionMgr.php
index f63a209f2..c29b8bc76 100644
--- a/views/bootstrap/class.ExtensionMgr.php
+++ b/views/bootstrap/class.ExtensionMgr.php
@@ -201,7 +201,7 @@ class SeedDMS_View_ExtensionMgr extends SeedDMS_Bootstrap_Style {
 				echo "<td nowrap>";
 				echo "<div class=\"list-action\">";
 				if(!$checkmsgs && $extmgr->isWritableExitDir())
-					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$extname."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$extname."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
+					echo "<form style=\"display: inline-block; margin: 0px;\" method=\"post\" action=\"../op/op.ExtensionMgr.php\" id=\"".$re['name']."-import\">".createHiddenFieldWithKey('extensionmgr')."<input type=\"hidden\" name=\"action\" value=\"import\" /><input type=\"hidden\" name=\"currenttab\" value=\"repository\" /><input type=\"hidden\" name=\"url\" value=\"".$re['filename']."\" /><a class=\"import\" data-extname=\"".$re['name']."\" title=\"".getMLText('import_extension')."\"><i class=\"icon-download\"></i></a></form>";
 				echo "</div>";
 				echo "</td>";
 				echo "</tr>";