diff --git a/css/style.css b/css/style.css
index 57f3a341d..3ce468c8e 100644
--- a/css/style.css
+++ b/css/style.css
@@ -5,7 +5,7 @@
 }
 html, body {border: 0; margin: 0; padding: 0; cursor: default; overflow: hidden; background-color: #F5F5F5; height: 100%;}
 html, body, input,select,button,textarea{font-family: Tahoma, Arial, Helvetica, sans-serif; font-size: 11px;}
-div, td, label, fieldset, textarea, select, input, button, .Button {
+div, td, label, fieldset, textarea, select, input, button, dialog {
   box-sizing: border-box;
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
@@ -468,7 +468,6 @@ span#loadimg {padding: 20px; background: transparent url(../images/ajax-loader.g
 .Icon_Share {background: transparent url(../images/share.gif) no-repeat left center}
 
 div#tadd-header {background-image: url(../images/world.gif)}
-div#tadd {display: none; left: 100px; top: 100px; position: absolute; margin: 0 auto }
 
 .konqueror div#tadd label { width: 80px; }
 .konqueror div#tadd { height: 290px; }
@@ -513,7 +512,7 @@ div#tadd {display: none; left: 100px; top: 100px; position: absolute; margin: 0
 }
 .speedEdit { width: 320px }
 #decimalDigitEdit input[type=number] {
-  min-width: 2rem;
+  min-width: 3rem;
 }
 .optionColumn {
   display: flex;
diff --git a/index.html b/index.html
index 6f192deb4..0db0c0f4d 100644
--- a/index.html
+++ b/index.html
@@ -296,6 +296,7 @@ <h4 class="offcanvas-title" id="offcanvas-sidepanel-label"></h4>
 		</div>
 		<div class="graph_tab_grid"></div>
 		<div class="graph_tab_legend"></div>
+		<div id="dir-container"></div>
 		<script type="text/javascript" src="./js/bootstrap.bundle.min.js?v=5b1"></script>
 	</body>
 </html>
diff --git a/js/common.js b/js/common.js
index 8ba48c930..b4916b553 100644
--- a/js/common.js
+++ b/js/common.js
@@ -299,6 +299,10 @@ const theOptionsSwitcher = {
 	run: function(id) {
 		$('#' + this.current).hide();
 		$("#mnu_" + this.current).removeClass("focus");
+		// close directory frames associated with the current option page
+		if (thePlugins.isInstalled("_getdir")) {
+			thePlugins.get("_getdir").hideBrowseFrame(this.current);
+		}
 		this.current = id;
 		$('#' + this.current).show();
 		$("#mnu_" + this.current).addClass("focus");
diff --git a/js/content.js b/js/content.js
index 610720785..2d535b8fe 100644
--- a/js/content.js
+++ b/js/content.js
@@ -639,7 +639,7 @@ function makeContent() {
 							$("<tr>").append(
 								...[
 									"", "Default", "KB", "MB", "GB", "TB", "PB",
-								].map((unit) => $("<td>").text(theUILang[unit] ?? "")),
+								].map((unit) => $("<th>").text(theUILang[unit] ?? "")),
 							),
 						),
 						$("<tbody>").append(
diff --git a/js/objects.js b/js/objects.js
index 81481ed95..89fd54f51 100644
--- a/js/objects.js
+++ b/js/objects.js
@@ -73,7 +73,21 @@ class DnD {
 		if (self.detachedMask) {
 			const offs = self.mask.offset();
 			self.mask.hide();
-			self.obj.css({left: offs.left, top: offs.top});
+			self.obj.css(offs);
+			// move directory frames along with the dialog window
+			self.obj.find(".browseEdit").each((i, ele) => {
+				if ($(`#${ele.id}_frame`).css("display") !== "none") {
+					// move open ones only because they will automatically reposition
+					// when toggled open
+					const frameOffs = ele.getBoundingClientRect();
+					$(`#${ele.id}_frame`).css(
+						{
+							top: frameOffs.bottom,
+							left: frameOffs.left,
+						}
+					);
+				}
+			});
 		}
 		$(document).off("mousemove", self.run);
 		$(document).off("mouseup", self.finish);
@@ -181,25 +195,38 @@ var theDialogManager =
 	        	this.items[id].afterShow(id);
 		this.bringToTop(id);
 	},
-	hide: function( id, callback )
-	{
-		var pos = $.inArray(id+"",this.visible);
-		if(pos>=0)
-			this.visible.splice(pos,1);
-        	var obj = $('#'+id);
-        	if($type(this.items[id]) && ($type(this.items[id].beforeHide)=="function"))
-	        	this.items[id].beforeHide(id);
-		obj.hide(this.divider,callback);
-        	if($type(this.items[id]) && ($type(this.items[id].afterHide)=="function"))
-	        	this.items[id].afterHide(id);
-		if(obj.data("modal"))
+	hide: function(id, callback) {
+		const pos = $.inArray(id + "", this.visible);
+		if (pos >= 0)
+			this.visible.splice(pos, 1);
+		const obj = $('#'+id);
+		if ($type(this.items[id]) && ($type(this.items[id].beforeHide) === "function"))
+			this.items[id].beforeHide(id);
+		obj.hide(this.divider, callback);
+		thePlugins.get("_getdir").hideBrowseFrame(id);  // close associated directory frames
+		if ($type(this.items[id]) && ($type(this.items[id].afterHide) === "function"))
+			this.items[id].afterHide(id);
+		if (obj.data("modal"))
 			this.clearModalState();
 	},
-	setHandler: function(id,type,handler)
-	{
-		if($type(this.items[id]))
-	        	this.items[id][type] = handler;
-		return(this);
+	setHandler: function(id, type, handler) {
+		if ($type(this.items[id]))
+			this.items[id][type] = handler;
+		return this;
+	},
+	addHandler: function(id, type, handler) {
+		if ($type(this.items[id])) {
+			const existing = this.items[id][type];
+			if (existing) {
+				this.items[id][type] = function() {
+					existing();
+					handler();
+				};
+			} else {
+				this.items[id][type] = handler;
+			}
+		}
+		return this;
 	},
 	isModalState: function()
 	{
diff --git a/js/webui.js b/js/webui.js
index 03d77bed0..72f20aac3 100644
--- a/js/webui.js
+++ b/js/webui.js
@@ -355,16 +355,9 @@ var theWebUI =
 		this.requestWithoutTimeout("?action=getuisettings", [this.initSettings, this], true);
 	},
 
-	loadPlugins: function()
-	{
-		if(thePlugins.isInstalled("_getdir"))
-		{
-			$('#dir_edit').after($("<input type=button>").addClass("Button").attr("id","dir_btn").on('focus', function() { this.blur(); } ));
-			var btn = new this.rDirBrowser( 'tadd', 'dir_edit', 'dir_btn' );
-			theDialogManager.setHandler('tadd','afterHide',function()
-			{
-				btn.hide();
-			});
+	loadPlugins: function() {
+		if (thePlugins.isInstalled("_getdir")) {
+			new this.rDirBrowser("dir_edit");
 		}
 		correctContent();
 		this.updateServerTime();
diff --git a/plugins/_getdir/_getdir.css b/plugins/_getdir/_getdir.css
index 95aee9767..74cedb6fa 100644
--- a/plugins/_getdir/_getdir.css
+++ b/plugins/_getdir/_getdir.css
@@ -1,24 +1,31 @@
-html {height: 100%;}
-body {background-color: window; color: windowtext; border: 0px; margin: 0px; padding: 0px; -moz-user-select:none; overflow: hidden; height: 100%;}
-.dir-list {display: flex; flex-direction: column; align-items: stretch; height: 100%;}
-.dir-list div {
-  padding-top: 1px;
-  padding-bottom: 1px;
-  padding-left: 0px;
-  padding-right: 0px;
-  cursor: default;
-  font-size: 11px;
-  font-family: Tahoma, Arial, Helvetica, sans-serif;
-  white-space: nowrap;
+.browseFrame {
+  position: absolute;
+  border: 1px solid #B0B0B0;
+  background-color: #F0F0F0;
+  height: 200px; /* default height 200px */
+  overflow: hidden;
+  padding: 0.25rem;
+  margin: 0;
+  display: flex;
+  flex-direction: column;
+}
+.rmenuobj {
+  border: 0;
+  overflow-y: auto;
+  padding: 0.25rem;
+}
+.rmenuitem {
+  color: windowtext;
+  padding: 0.15rem;
+  text-wrap: nowrap;
+}
+.rmenuitem.active {
+  color: highlighttext;
+  background-color: highlight;
 }
-.search-bar {display: flex; flex-direction: row;}
-.search-bar input[type="text"] {flex-grow: 1;}
-.rmenuobj {margin-bottom: 5px; border-width: 0; overflow-y: auto; flex-grow: 1;}
-.rmenuitem { color: windowtext; }
-.rmenuitemselected { color: highlighttext; background-color: highlight; }
 
 input.browseButton, button.browseButton {
-  width:30px;
+  width: 30px;
   margin-left: 0.25rem;
   margin-right: 0.25rem;
 }
diff --git a/plugins/_getdir/getdirs.php b/plugins/_getdir/getdirs.php
deleted file mode 100644
index 29ffb9ac8..000000000
--- a/plugins/_getdir/getdirs.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php
-require_once( '../../php/util.php' );
-require_once( '../../php/settings.php' );
-eval(FileUtil::getPluginConf("_getdir"));
-
-$dh = false;
-$theSettings = rTorrentSettings::get();
-
-$btn_id = "'".$_REQUEST['btn']."'";
-$edit_id = "'".$_REQUEST['edit']."'";
-$frame_id = "'".$_REQUEST['frame']."'";
-
-function compareEntries( $a, $b )
-{
-	if($a=='.')
-		return( -1 );
-	if($b=='.')
-		return( 1 );
-	if($a=='..')
-		return( -1 );
-	if($b=='..')
-		return( 1 );
-	return( function_exists("mb_strtolower") ? 
-		strcmp(mb_strtolower($a), mb_strtolower($b)) :
-		strcmp(strtolower($a), strtolower($b)) );
-}
-
-if(isset($_REQUEST['dir']) && strlen($_REQUEST['dir']))
-{
-	$dir = rawurldecode($_REQUEST['dir']);
-	rTorrentSettings::get()->correctDirectory($dir);
-	$dh = @opendir($dir);
-	$dir = FileUtil::addslash($dir);
-
-	if( $dh &&
-		((strpos($dir,$topDirectory)!==0) ||
-		(($theSettings->uid>=0) && 
-		$checkUserPermissions &&
-		!Permission::doesUserHave($theSettings->uid,$theSettings->gid,$dir,0x0007))))
-	{
-		closedir($dh);
-		$dh = false;
-	}
-}
-if(!$dh)
-{
-	$dir = User::isLocalMode() ? $theSettings->directory : $topDirectory;
-	if(strpos(FileUtil::addslash($dir),$topDirectory)!==0)
-		$dir = $topDirectory;
-	$dh = @opendir($dir);
-}
-$files = array();
-if($dh)
-{
-	$dir = FileUtil::addslash($dir);
-	while(false !== ($file = readdir($dh)))
-        {
-		$path = FileUtil::fullpath($dir . $file);
-		if(($file=="..") && ($dir==$topDirectory))
-			continue;
-		if(is_dir($path) &&
-			(strpos(FileUtil::addslash($path),$topDirectory)===0) &&
-			( $theSettings->uid<0 || (!$checkUserPermissions || Permission::doesUserHave($theSettings->uid,$theSettings->gid,$path,0x0007)) )
-			)
-		{
-			$files[$file.""] = FileUtil::addslash($path);
-		}
-        }
-        closedir($dh);
-	uksort($files,"compareEntries");
-}
-?>
-<!DOCTYPE html>
-<head>
-<link href="./_getdir.css?v=430" rel="stylesheet" type="text/css" />
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<script language='JavaScript'>
-
-document.oncontextmenu = function(e) { return false; }
-document.ondragstart = function() { return false; };
-document.onselectstart = function() { return false; };
-
-var ownerDocument = window.frameElement.ownerDocument;
-
-function keyHandler(e)
-{
-	e = e || window.event;
-	var charCode = (e.which == null) ? e.keyCode : ((e.which!=0 && e.charCode!=0) ? e.which : 0);
-	if(charCode>=32)
-	{
-		var el = document.getElementById('i'+e.charCode);
-		if( el )
-		{
-			menuClick(el);
-			!el.scrollIntoView || el.scrollIntoView(false);
-			e.preventDefault ? e.preventDefault() : (e.returnValue = false);
-		}			
-	}
-}
-
-function init()
-{
-	menuClick(document.getElementById('root'));
-	if(/WebKit/i.test(navigator.userAgent))
-	{
-		var _timer=setInterval(function(){ scrollBy(1,1); clearInterval(_timer); },10);
-	}
-	// window.onkeypress = keyHandler;
-}
-
-selected = null;
-
-function menuClick(obj)
-{
-	if(selected)
-		selected.className = 'rmenuitem';
-	obj.className = 'rmenuitemselected';
-	selected = obj;
-	var code = obj.getAttribute('code');
-	if(code && window.frameElement)
-	{
-		var el = ownerDocument.getElementById(<?php echo $edit_id;?>);
-		el.value = decodeURIComponent(code);
-	}
-}
-
-function menuDblClick(obj)
-{
-	menuClick(obj);
-	location.search = "?dir="+obj.getAttribute('code') +
-		"&btn=" + <?php echo $btn_id;?> +
-		"&edit=" + <?php echo $edit_id;?> +
-		"&frame=" + <?php echo $frame_id;?> +
-		"&time=" + (new Date()).getTime();
-}
-
-function hideFrame()
-{
-	window.frameElement.style.display = "none";
-	window.frameElement.style.visibility = "hidden";
-	var edit = ownerDocument.getElementById(<?php echo $edit_id;?>);
-	var btn = ownerDocument.getElementById(<?php echo $btn_id;?>);
-	btn.value = "...";
-	edit.readOnly = false;
-}
-
-function menuDblClickAndExit(obj)
-{
-	menuClick(obj);
-	hideFrame();
-}
-</script>
-</head>
-<body onLoad='init()'>
-	<div class="dir-list">
-		<div class="search-bar"><input id="dir-search-bar" type="text" class="filter-dir" placeholder="Type to filter..." /></div>
-		<div class="rmenuobj">
-			<?php
-			function ordutf8($s) 
-			{
-				if(function_exists("mb_convert_encoding"))
-				{
-					list(, $ret) = unpack('N', mb_convert_encoding(mb_strtolower($s), 'UCS-4BE', 'UTF-8'));
-				}
-				else
-				{
-					$ret = ord( strtolower($s) );
-				}
-				return($ret);
-			}
-
-			foreach($files as $key=>$data)
-			{
-				$key = trim($key);
-				$chr = ordutf8($key);
-				if($key==='.')
-					echo "<div code='".rawurlencode($data)."' id='root' class='rmenuitemselected' nowrap onclick='menuClick(this); return false;' ondblclick='menuDblClickAndExit(this); return false;'>";
-				else
-					echo "<div code='".rawurlencode($data)."' class='rmenuitem' id='i".$chr."' nowrap onclick='menuClick(this); return false;' ondblclick='menuDblClick(this); return false;'>";
-				echo "&nbsp;&nbsp;";
-				echo $key;
-				echo "</div>";
-			}
-			?>
-		</div>
-	</div>
-	<script type="text/javascript" src="../../js/browser.js?v=430"></script>
-	<script type="text/javascript" src="./utils.js?v=430"></script>
-</body>
diff --git a/plugins/_getdir/getfiles.php b/plugins/_getdir/getfiles.php
deleted file mode 100644
index d9105d9b0..000000000
--- a/plugins/_getdir/getfiles.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-require_once( '../../php/util.php' );
-require_once( '../../php/settings.php' );
-eval(FileUtil::getPluginConf("_getdir"));
-
-$theSettings = rTorrentSettings::get();
-$dh = false;
-$curFile = null;
-
-$btn_id = "'".$_REQUEST['btn']."'";
-$edit_id = "'".$_REQUEST['edit']."'";
-$frame_id = "'".$_REQUEST['frame']."'";
-
-function compareEntries( $a, $b )
-{
-	if($a=='/.')
-		return( -1 );
-	if($b=='/.')
-		return( 1 );
-	if($a=='/..')
-		return( -1 );
-	if($b=='/..')
-		return( 1 );
-	return( function_exists("mb_strtolower") ? 
-		strcmp(mb_strtolower($a), mb_strtolower($b)) :
-		strcmp(strtolower($a), strtolower($b)) );
-}
-
-if(isset($_REQUEST['dir']) && strlen($_REQUEST['dir']))
-{
-	$dir = rawurldecode($_REQUEST['dir']);
-	rTorrentSettings::get()->correctDirectory($dir);
-	if(LFS::is_file($dir) && 
-		(($theSettings->uid<0) || 
-		!$checkUserPermissions ||
-		Permission::doesUserHave($theSettings->uid,$theSettings->gid,$dir,0x0004)))
-	{
-		$curFile = basename($dir);
-		$dir = dirname($dir);
-	}
-	if(is_dir($dir))
-	{
-		$dh = @opendir($dir);
-		$dir = FileUtil::addslash($dir);
-		if( $dh && 
-			((strpos($dir,$topDirectory)!==0) ||
-			(($theSettings->uid>=0) && 
-			$checkUserPermissions &&
-			!Permission::doesUserHave($theSettings->uid,$theSettings->gid,$dir,0x0005))))
-		{
-			closedir($dh);
-			$dh = false;
-		}
-	}
-}
-if(!$dh)
-{
-	$curFile = null;
-	$dir = User::isLocalMode() ? $theSettings->directory : $topDirectory;
-	if(strpos(FileUtil::addslash($dir),$topDirectory)!==0)
-		$dir = $topDirectory;
-	$dh = @opendir($dir);
-}
-$files = array();
-$dirs = array();
-if($dh)
-{
-	$dir = FileUtil::addslash($dir);
-	while(false !== ($file = readdir($dh)))
-        {
-	        $path = FileUtil::fullpath($dir . $file);
-		if(($file=="..") && ($dir==$topDirectory))
-			continue;
-		if(is_dir($path) &&
-			(strpos(FileUtil::addslash($path),$topDirectory)===0) &&
-			( $theSettings->uid<0 || !$checkUserPermissions || Permission::doesUserHave($theSettings->uid,$theSettings->gid,$path,0x0005) )
-			)
-			$dirs['/'.$file] = FileUtil::addslash($path);
-		else
-		{
-			if(LFS::is_file($path)
-				&& ( $theSettings->uid<0 || Permission::doesUserHave($theSettings->uid,$theSettings->gid,$path,0x0004))
-				)
-				$files[$file." "] = $path;
-		}
-        }
-        closedir($dh);
-        uksort($files,"compareEntries");
-        uksort($dirs,"compareEntries");
-	$files = array_merge($dirs,$files);
-}
-?>
-<!DOCTYPE html>
-<head>
-<link href="./_getdir.css?v=430" rel="stylesheet" type="text/css" />
-<title></title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<script language='JavaScript'>
-
-document.oncontextmenu = function(e) { return false; }
-document.ondragstart = function() { return false; };
-document.onselectstart = function() { return false; };
-
-function bin2hex(s)
-{
-	var v,i, f = 0, a = [];
-	s += '';
-	f = s.length;
-	for (i = 0; i<f; i++)
-        	a[i] = s.charCodeAt(i).toString(16).replace(/^([\da-f])$/,"0$1");
-	return a.join('');
-}
-
-var doc = null;
-
-function keyHandler(e)
-{
-	e = e || window.event;
-	var charCode = (e.which == null) ? e.keyCode : ((e.which!=0 && e.charCode!=0) ? e.which : 0);
-	if(charCode>=32)
-	{
-		var elements = document.getElementsByName('i'+e.charCode);
-		if( elements.length )
-		{
-			var el = elements[0];
-			menuClick(el);
-			!el.scrollIntoView || el.scrollIntoView(false);
-			e.preventDefault ? e.preventDefault() : (e.returnValue = false);
-		}			
-	}
-}
-
-function init()
-{
-	doc = window.frameElement.ownerDocument;
-<?php
-	if(!$curFile)
-		$curFile = "/.";
-	echo "var el=document.getElementById('".bin2hex($curFile)."');";
-?>
-	document.documentElement.scrollTop = el.offsetTop;
-	menuClick(el);
-	if(/WebKit/i.test(navigator.userAgent))
-	{
-		var _timer=setInterval(function(){ scrollBy(1,1); clearInterval(_timer); },10);
-	}
-	// window.onkeypress = keyHandler;	
-}
-
-selected = null;
-
-function menuClick(obj)
-{
-	if(selected)
-		selected.className = 'rmenuitem';
-	obj.className = 'rmenuitemselected';
-	selected = obj;
-	var code = obj.getAttribute('code');
-	if(code && doc)
-	{
-		var el = doc.getElementById(<?php echo $edit_id;?>);
-		el.value = decodeURIComponent(code);
-	}
-}
-
-function menuDblClick(obj)
-{
-	menuClick(obj);
-	location.search = "?dir="+obj.getAttribute('code')+ 
-		"&btn=" + <?php echo $btn_id;?> +
-		"&edit=" + <?php echo $edit_id;?> +
-		"&frame=" + <?php echo $frame_id;?> +
-		"&time=" + (new Date()).getTime();
-}
-
-function hideFrame()
-{
-	window.frameElement.style.visibility = "hidden";
-	window.frameElement.style.display = "none";
-	var edit = doc.getElementById(<?php echo $edit_id;?>);
-	var btn = doc.getElementById(<?php echo $btn_id;?>);
-	btn.value = "...";
-	edit.readOnly = false;
-}
-
-function menuDblClickAndExit(obj)
-{
-	menuClick(obj);
-	hideFrame();
-}
-</script>
-</head>
-<body onLoad='init()'>
-	<div class="dir-list">
-		<div class="search-bar"><input id="dir-search-bar" type="text" class="filter-dir" placeholder="Type to filter..." /></div>
-		<div class="rmenuobj">
-			<?php
-			function ordutf8($s, $offset) 
-			{
-				if(function_exists("mb_convert_encoding"))
-				{
-					list(, $ret) = unpack('N', mb_convert_encoding(mb_strtolower(mb_substr($s,$offset,1)), 'UCS-4BE', 'UTF-8'));
-				}
-				else
-				{
-					$ret = ord( strtolower($s[$offset]) );
-				}
-				return($ret);
-			}
-
-			foreach($files as $key=>$data)
-			{
-				$chr = ordutf8($key,0);
-				if(($key=='/.') || ($key[0]!='/'))
-					echo "<div code='".rawurlencode($data)."' id='".bin2hex($key)."' name='i".$chr."' class='rmenuitem' nowrap onclick='menuClick(this); return false;' ondblclick='menuDblClickAndExit(this); return false;'>";
-				else
-				{
-					$chr = ordutf8($key,1);
-					echo "<div code='".rawurlencode($data)."' id='".bin2hex($key)."' name='i".$chr."' class='rmenuitem' nowrap onclick='menuClick(this); return false;' ondblclick='menuDblClick(this); return false;'>";
-				}		
-				echo "&nbsp;&nbsp;";
-				echo $key;
-				echo "</div>";
-			}
-			?>
-		</div>
-	</div>
-	<script type="text/javascript" src="../../js/browser.js?v=430"></script>
-	<script type="text/javascript" src="./utils.js?v=430"></script>
-</body>
diff --git a/plugins/_getdir/init.js b/plugins/_getdir/init.js
index db55a4c79..5a46ff8d8 100644
--- a/plugins/_getdir/init.js
+++ b/plugins/_getdir/init.js
@@ -1,80 +1,196 @@
+plugin.loadLang();
 plugin.loadMainCSS();
 
-theWebUI.rDirBrowser = function( dlg_id, edit_id, btn_id, frame_id, withFiles, height )
-{
-	this.edit = $('#'+edit_id);
-	this.btn  = $('#'+btn_id);
-	this.scriptName = withFiles ? "getfiles" : "getdirs";
-	if(!frame_id)
-		frame_id = edit_id+"_frame";
-	var self = this;
-	this.setButtonText("...")
-	this.btn.on( "click", function() { return(self.toggle()); } ).addClass("browseButton");
-	this.edit.prop("autocomplete", "off").on( browser.isIE ? "focusin" : "focus", function() { return(self.hide()); } ).addClass("browseEdit");
-	this.frame = $("<iframe>").attr( {id: frame_id, src: ""} ).css({position: "absolute", width: 0, visibility: "hidden"}).addClass("browseFrame");
-	this.dlg_id = dlg_id;
-	$('#'+dlg_id).append( this.frame );
-	this.height = !height ? 150 : height
+function filterDir(ev) {
+	const keyword = ev.currentTarget.value.toUpperCase();
+	if (!keyword || keyword.length === 0) {
+		$(ev.currentTarget).next().children().css("display", "");
+		return;
+	}
+	$(ev.currentTarget).next().find(".rmenuitem").map((_, dir) => {
+		const txtValue = dir.textContent || dir.innerText;
+		dir.style.display = txtValue.toUpperCase().indexOf(keyword) > -1 ? "" : "none";
+	});
 }
 
-theWebUI.rDirBrowser.prototype.setButtonText = function(buttonText)
-{
-	if(this.btn[0].tagName === "INPUT") {
-		this.btn.val(buttonText);
-	} else if(this.btn[0].tagName === "BUTTON") {
-		this.btn.text(buttonText);
+theWebUI.rDirBrowser = class {
+	constructor(edit_id, withFiles, height) {
+		const self = this;
+		this.edit = $('#' + edit_id).addClass("browseEdit").prop("autocomplete", "off").on(
+			browser.isIE ? "focusin" : "focus", () => self.hide()
+		);
+		this.btn = $("<button>").attr(
+			{type:"button", id:edit_id + "_btn"}
+		).addClass("browseButton").text("...").on(
+			"focus", (ev) => ev.currentTarget.blur()
+		).on("click", () => self.toggle());
+		this.edit.after(
+			this.btn,
+		);
+		this.withFiles = withFiles;
+		this.height = height;
+		this.frame = $("<dialog>").attr({id: edit_id + "_frame"}).addClass("browseFrame").append(
+			$("<input>").attr(
+				{type: "text", placeholder:theUILang.typeToFilter}
+			).addClass("filter-dir").on("input", filterDir),
+		).on(
+			"keydown", (ev) => {
+				// some keyboard shortcuts for dir list operation
+				switch (ev.key) {
+					case "Escape": {
+						ev.stopPropagation();
+						if ($(ev.currentTarget).find(".filter-dir").val() === "") {
+							this.hide();
+						} else {
+							$(ev.currentTarget).find(".filter-dir").val("").trigger("input");
+						}
+					} break;
+					case "ArrowDown": {
+						const selector = "[style!='display: none;']";
+						const itemList = $(ev.currentTarget).find(".rmenuitem" + selector);
+						if (itemList.filter(".active").length === 0) {
+							itemList.first().trigger("click");
+						} else {
+							itemList.filter(".active").nextAll(selector).first().trigger("click");
+						}
+					} break;
+					case "ArrowUp": {
+						const selector = "[style!='display: none;']";
+						const itemList = $(ev.currentTarget).find(".rmenuitem" + selector);
+						if (itemList.filter(".active").length === 0) {
+							itemList.last().trigger("click");
+						} else {
+							itemList.filter(".active").prevAll(selector).first().trigger("click");
+						}
+					}	break;
+					case "ArrowRight": {
+						$(ev.currentTarget).find(".rmenuitem.active").trigger("dblclick");
+					} break;
+					case "ArrowLeft": {
+						$(ev.currentTarget).find(".rmenuitem:contains('..')").trigger("click").trigger("dblclick");
+					} break;
+					case "Home": {
+						$(ev.currentTarget).find(".rmenuitem").first().trigger("click");
+					} break;
+					case "End": {
+						$(ev.currentTarget).find(".rmenuitem").last().trigger("click");
+					} break;
+				}
+
+			// scroll vertically if selected item is out of list container
+			const selected = $(ev.currentTarget).find(".rmenuitem.active");
+			if (selected.length === 0)
+				return;
+			const selPos = {
+				top: selected.offset().top,
+				bottom: selected.offset().top + selected.outerHeight(),
+			};
+			const container = $(ev.currentTarget).find(".rmenuobj");
+			const contPos = {
+				top: container.offset().top,
+				bottom: container.offset().top + container[0].clientHeight,
+			};
+			const bottomDiff = selPos.bottom - contPos.bottom;
+			if (bottomDiff > 0) {
+				const topScroll = container.scrollTop();
+				container.scrollTop(topScroll + bottomDiff);
+				return;
+			}
+			const topDiff = selPos.top - contPos.top;
+			if (topDiff < 0) {
+				const topScroll = container.scrollTop();
+				container.scrollTop(topScroll + topDiff);
+				return;
+			}
+		}).hide();
+		$("#dir-container").append(this.frame);
 	}
-}
 
-theWebUI.rDirBrowser.prototype.show = function()
-{
-	var x = this.edit[0].offsetLeft;
-	var y = this.edit[0].offsetTop + this.edit[0].offsetHeight;
-	var parent = this.edit[0].offsetParent;
-	while( parent && parent.id != this.dlg_id )
-	{
-		x += parent.offsetLeft;
-		y += parent.offsetTop;
-		parent = parent.offsetParent;
+	requestDir() {
+		const path = this.edit.val();
+		if (path.length > 0 && !path.endsWith("/")) {
+			this.edit.val(path.slice(0, path.lastIndexOf("/") + 1));
+		}
+		$.ajax(
+			`plugins/_getdir/listdir.php?dir=${encodeURIComponent(this.edit.val())}&time=${(new Date()).getTime()}${this.withFiles ? "&withfiles=1" : ""}`,
+			{
+				success: (res) => {
+					this.frame.find(".filter-dir").val("").trigger("focus");
+					this.edit.val(res.path).data({cwd:res.path});
+					this.frame.find(".rmenuobj").remove();
+					this.frame.append(
+						$("<div>").addClass("rmenuobj").append(
+							...res.directories.map(ele => $("<div>").addClass("rmenuitem").text(ele + "/")),
+							...(this.withFiles ? res.files : []).map(ele => $("<div>").addClass("rmenuitem").text(ele)),
+						),
+					);
+					this.frame.find(".rmenuitem").on(
+						"click", (ev) => this.selectItem(ev)
+					).on(
+						"dblclick", (ev) => (ev.currentTarget.innerText.endsWith("/")) ? this.requestDir() : this.hide()
+					);
+				},
+				error: (res) => console.log(res),
+			}
+		);
 	}
-        this.frame.prop("src","plugins/_getdir/"+this.scriptName+".php?dir="+ encodeURIComponent(this.edit.val()) +
-		"&btn=" + this.btn.attr("id") +
-		"&edit=" + this.edit.attr("id") +
-		"&frame=" + this.frame.attr("id") +
-		"&time=" + (new Date()).getTime()).css(
-		{
-			visibility: "visible",
-			left: x,
-			top: y,
-			width: this.edit.width()+2,
-			height: this.height
+
+	selectItem(ev) {
+		this.frame.find(".rmenuitem.active").removeClass("active");
+		$(ev.currentTarget).addClass("active");
+		this.edit.val(this.edit.data("cwd") + ev.target.innerText);
+	}
+
+	show() {
+		const { top, left } = this.edit.offset();
+		this.frame.css({
+			left: left,
+			top: top + this.edit.outerHeight(),
+			width: this.edit.width(),
+			height: this.height || "",
 		}).show();
-	this.setButtonText("X");
-	theDialogManager.bringToTop(this.frame.attr("id"));
-	this.edit.prop( "read-only", true );
-	return(false);
+		this.requestDir();
+		this.btn.text("X");
+		theDialogManager.bringToTop(this.frame.attr("id"));
+		this.edit.prop("read-only", true);
+		return false;
+	}
+
+	hide() {
+		if (this.frame.css("display") !== "none") {
+			this.btn.text("...");
+			this.edit.prop("read-only", false);
+			this.frame.find(".filter-dir").val("");
+			this.frame.hide();
+		}
+		return false;
+	}
+
+	toggle() {
+		return (this.frame.css("display") !== "none") ? this.hide() : this.show();
+	}
 }
 
-theWebUI.rDirBrowser.prototype.hide = function()
-{
-	if(this.frame.css("visibility")!="hidden")
-	{
-		this.setButtonText("...");
-		this.edit.prop( "read-only", false );
-		this.frame.css( { visibility: "hidden" } );
-		this.frame.hide().css( {width: 0} );	
+plugin.hideBrowseFrame = function(containerId) {
+	if (thePlugins.isInstalled("_getdir")) {
+		$(`#${containerId} .browseEdit`).each((_, ele) => {
+			const frame = $(`#${ele.id}_frame`);
+			if (frame.css("display") !== "none") {
+				$(`#${ele.id}_btn`).text("...");
+				$(`#${ele.id}`).prop("read-only", false);
+				frame.find(".filter-dir").val("");
+				frame.hide();
+			}
+		});
 	}
-	return(false);
 }
 
-theWebUI.rDirBrowser.prototype.toggle = function()
-{
-	return((this.frame.css("visibility")!="hidden") ? this.hide() : this.show());
+plugin.onLangLoaded = function() {
+	$(".filter-dir:not([placeholder])").attr({placeholder:theUILang.typeToFilter});
 }
 
-plugin.onRemove = function()
-{
+plugin.onRemove = function() {
 	$(".browseButton").remove();
 	$(".browseFrame").remove();
-	$(".browseEdit").prop("autocomplete", "on").off( browser.isIE ? "focusin" : "focus" );
+	$(".browseEdit").prop("autocomplete", "on").off(browser.isIE ? "focusin" : "focus");
 }
diff --git a/plugins/_getdir/lang/cs.js b/plugins/_getdir/lang/cs.js
new file mode 100644
index 000000000..801631798
--- /dev/null
+++ b/plugins/_getdir/lang/cs.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Czech language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/da.js b/plugins/_getdir/lang/da.js
new file mode 100644
index 000000000..115c17ca4
--- /dev/null
+++ b/plugins/_getdir/lang/da.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Danish language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/de.js b/plugins/_getdir/lang/de.js
new file mode 100644
index 000000000..e330ecf8e
--- /dev/null
+++ b/plugins/_getdir/lang/de.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * German language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/el.js b/plugins/_getdir/lang/el.js
new file mode 100644
index 000000000..c7b461e91
--- /dev/null
+++ b/plugins/_getdir/lang/el.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Greek language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/en.js b/plugins/_getdir/lang/en.js
new file mode 100644
index 000000000..db7ae388c
--- /dev/null
+++ b/plugins/_getdir/lang/en.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * English language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/es.js b/plugins/_getdir/lang/es.js
new file mode 100644
index 000000000..17a68367b
--- /dev/null
+++ b/plugins/_getdir/lang/es.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Spanish language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/fi.js b/plugins/_getdir/lang/fi.js
new file mode 100644
index 000000000..ee2fa25fa
--- /dev/null
+++ b/plugins/_getdir/lang/fi.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Finnish language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/fr.js b/plugins/_getdir/lang/fr.js
new file mode 100644
index 000000000..80e442a4e
--- /dev/null
+++ b/plugins/_getdir/lang/fr.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * French language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/hu.js b/plugins/_getdir/lang/hu.js
new file mode 100644
index 000000000..d61a6d6e9
--- /dev/null
+++ b/plugins/_getdir/lang/hu.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Hungarian language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/it.js b/plugins/_getdir/lang/it.js
new file mode 100644
index 000000000..2470335c4
--- /dev/null
+++ b/plugins/_getdir/lang/it.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Italian language file.
+ *
+ * Author: Marco (marco.romanelli@protonmail.ch)
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/ko.js b/plugins/_getdir/lang/ko.js
new file mode 100644
index 000000000..264639c51
--- /dev/null
+++ b/plugins/_getdir/lang/ko.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Korean language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/lv.js b/plugins/_getdir/lang/lv.js
new file mode 100644
index 000000000..54eed1c4d
--- /dev/null
+++ b/plugins/_getdir/lang/lv.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Latvian language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/nl.js b/plugins/_getdir/lang/nl.js
new file mode 100644
index 000000000..aa8b7e03d
--- /dev/null
+++ b/plugins/_getdir/lang/nl.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Dutch language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/no.js b/plugins/_getdir/lang/no.js
new file mode 100644
index 000000000..875cb963f
--- /dev/null
+++ b/plugins/_getdir/lang/no.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Norwegian language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/pl.js b/plugins/_getdir/lang/pl.js
new file mode 100644
index 000000000..24954640c
--- /dev/null
+++ b/plugins/_getdir/lang/pl.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Polish language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/pt-br.js b/plugins/_getdir/lang/pt-br.js
new file mode 100644
index 000000000..75a08bbf2
--- /dev/null
+++ b/plugins/_getdir/lang/pt-br.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Portuguese (Brazil) language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/pt-pt.js b/plugins/_getdir/lang/pt-pt.js
new file mode 100644
index 000000000..e8dea2c88
--- /dev/null
+++ b/plugins/_getdir/lang/pt-pt.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Portuguese (Portugal) language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/ru.js b/plugins/_getdir/lang/ru.js
new file mode 100644
index 000000000..8f56c0634
--- /dev/null
+++ b/plugins/_getdir/lang/ru.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Russian language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/sk.js b/plugins/_getdir/lang/sk.js
new file mode 100644
index 000000000..34995271a
--- /dev/null
+++ b/plugins/_getdir/lang/sk.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Slovak language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/sr.js b/plugins/_getdir/lang/sr.js
new file mode 100644
index 000000000..c6c7e7cb8
--- /dev/null
+++ b/plugins/_getdir/lang/sr.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Serbian language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/sv.js b/plugins/_getdir/lang/sv.js
new file mode 100644
index 000000000..a9caf00fa
--- /dev/null
+++ b/plugins/_getdir/lang/sv.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Swedish language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/tr.js b/plugins/_getdir/lang/tr.js
new file mode 100644
index 000000000..e1460754b
--- /dev/null
+++ b/plugins/_getdir/lang/tr.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Turkish language file.
+ *
+ * Author: Müslüm Barış Korkmazer (bkbabinco@gmail.com)
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/uk.js b/plugins/_getdir/lang/uk.js
new file mode 100644
index 000000000..67cce9a54
--- /dev/null
+++ b/plugins/_getdir/lang/uk.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Ukrainian language file.
+ *
+ * Author: Oleksandr Natalenko (oleksandr@natalenko.name)
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/vi.js b/plugins/_getdir/lang/vi.js
new file mode 100644
index 000000000..cbd2ed111
--- /dev/null
+++ b/plugins/_getdir/lang/vi.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Vietnamese language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/zh-cn.js b/plugins/_getdir/lang/zh-cn.js
new file mode 100644
index 000000000..43f79ebd9
--- /dev/null
+++ b/plugins/_getdir/lang/zh-cn.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Chinese Simplified language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/lang/zh-tw.js b/plugins/_getdir/lang/zh-tw.js
new file mode 100644
index 000000000..d2984e286
--- /dev/null
+++ b/plugins/_getdir/lang/zh-tw.js
@@ -0,0 +1,10 @@
+/* PLUGIN _GETDIR
+ *
+ * Chinese Traditional language file.
+ *
+ * Author: 
+ */
+
+ theUILang.typeToFilter		= "Type to filter...";
+
+thePlugins.get("_getdir").langLoaded();
diff --git a/plugins/_getdir/listdir.php b/plugins/_getdir/listdir.php
new file mode 100644
index 000000000..d502411b5
--- /dev/null
+++ b/plugins/_getdir/listdir.php
@@ -0,0 +1,50 @@
+<?php
+require_once( '../../php/util.php' );
+require_once( '../../php/settings.php' );
+eval(FileUtil::getPluginConf("_getdir"));
+
+$theSettings = rTorrentSettings::get();
+
+$requestedDir = $_REQUEST['dir'];
+
+if(isset($requestedDir) && strlen($requestedDir))
+{
+	$dir = rawurldecode($requestedDir);
+	rTorrentSettings::get()->correctDirectory($dir);
+	$dir = FileUtil::addslash($dir);
+
+	if(
+			(strpos($dir,$topDirectory)!==0) ||
+			(($theSettings->uid>=0) && $checkUserPermissions && !Permission::doesUserHave($theSettings->uid,$theSettings->gid,$dir,0x0007))
+		)
+	{
+		$dir = $topDirectory;
+	}
+}
+else
+{
+	$dir = User::isLocalMode() ? $theSettings->directory : $topDirectory;
+	if(strpos(FileUtil::addslash($dir),$topDirectory)!==0)
+		$dir = $topDirectory;
+
+	if(strrpos($dir, '/') != strlen($dir) - 1)
+		$dir = FileUtil::addslash($dir);
+}
+
+$items = array_diff(scandir($dir), (($dir == $topDirectory) ? ["..", "."] : ["."]));
+$directories = array_filter($items, function ($item) {
+	global $dir;
+	return is_dir($dir.$item);
+});
+$files = array_filter($items, function ($item) {
+	global $dir;
+	return is_file($dir.$item);
+});
+
+header("Content-Type: application/json");
+echo JSON::safeEncode(array(
+	"path" => $dir,
+	"directories" => array_values($directories),
+	"files" => array_values($files),
+));
+?>
diff --git a/plugins/_getdir/utils.js b/plugins/_getdir/utils.js
deleted file mode 100644
index 0790d14e1..000000000
--- a/plugins/_getdir/utils.js
+++ /dev/null
@@ -1,30 +0,0 @@
-function filterDir(e) {
-	if (e.key === "Escape") {
-		e.target.value = "";
-	}
-	let keyword = e.currentTarget.value.toUpperCase();
-	let dirs = document.querySelector(".rmenuobj").querySelectorAll("div");
-	for (let i = 0; i < dirs.length; i++) {
-		if (dirs[i]) {
-			let txtValue = dirs[i].textContent || dirs[i].innerText;
-			dirs[i].style.display = txtValue.toUpperCase().indexOf(keyword) > -1 ? "" : "none";
-		}
-	}
-}
-
-document.getElementById("dir-search-bar").addEventListener("keyup", filterDir);
-document.addEventListener("readystatechange", () => {
-	if (document.readyState === "complete") {
-		const browser = new browserDetect();
-		if (browser.isFirefox) {
-			// A `setTimeout()` function is used here for browser compatability,
-			// as a plain `focus()` wouldn't work on FireFox.
-			setTimeout(() => {
-				document.getElementById("dir-search-bar").focus();
-			}, 100); 
-		} else {
-			// This has been tested on Chrome and MS Edge, both working fine.
-			document.getElementById("dir-search-bar").focus();
-		}
-	}
-});
diff --git a/plugins/autotools/init.js b/plugins/autotools/init.js
index 22295f2ff..e37fce5f5 100644
--- a/plugins/autotools/init.js
+++ b/plugins/autotools/init.js
@@ -10,11 +10,11 @@ if (plugin.canChangeOptions()) {
 			$$('enable_move').checked  = (theWebUI.autotools.EnableMove === 1);
 			$$('path_to_finished').value = theWebUI.autotools.PathToFinished;
 			$$('skip_move_for_files').value = theWebUI.autotools.SkipMoveForFiles;
-			linked($$('enable_move'), 0, ['automove_filter', 'path_to_finished', 'skip_move_for_files', 'automove_browse_btn', 'fileop_type', 'auto_add_label', 'auto_add_name']);
+			linked($$('enable_move'), 0, ['automove_filter', 'path_to_finished', 'skip_move_for_files', 'path_to_finished_btn', 'fileop_type', 'auto_add_label', 'auto_add_name']);
 			$$('fileop_type').value = theWebUI.autotools.FileOpType;
 			$$('enable_watch').checked  = (theWebUI.autotools.EnableWatch === 1);
 			$$('path_to_watch').value = theWebUI.autotools.PathToWatch;
-			linked($$('enable_watch'), 0, ['path_to_watch', 'autowatch_browse_btn', 'watch_start']);
+			linked($$('enable_watch'), 0, ['path_to_watch', 'path_to_watch_btn', 'watch_start']);
 			$$('watch_start').checked  = (theWebUI.autotools.WatchStart === 1);
 			if (plugin.DirBrowser1)
 				plugin.DirBrowser1.hide();
@@ -99,7 +99,7 @@ plugin.onLangLoaded = function() {
 				),
 				$("<div>").addClass("row").append(
 					$("<div>").addClass("col-1 justify-content-md-end").append(
-						$("<input>").attr({type:"checkbox", id:"enable_move", onchange:"linked(this, 0, ['automove_filter', 'skip_move_for_files', 'path_to_finished', 'automove_browse_btn', 'fileop_type', 'auto_add_label', 'auto_add_name']);"}),
+						$("<input>").attr({type:"checkbox", id:"enable_move", onchange:"linked(this, 0, ['automove_filter', 'skip_move_for_files', 'path_to_finished', 'path_to_finished_btn', 'fileop_type', 'auto_add_label', 'auto_add_name']);"}),
 					),
 					$("<div>").addClass("col-11").append(
 						$("<label>").attr({for:"enable_move"}).text(theUILang.autotoolsEnableMove),
@@ -118,7 +118,6 @@ plugin.onLangLoaded = function() {
 					),
 					$("<div>").addClass("col-11 offset-1").append(
 						$("<input>").attr({type:"text", id:"path_to_finished", maxlength:100}),
-						$("<button>").attr({type:"button", id:"automove_browse_btn"}).addClass("browseButton").text("..."),
 					),
 					$("<div>").addClass("col-11 col-md-5 offset-1").append(
 						$("<label>").attr({id:"lbl_fileop_type", for:"fileop_type"}).addClass("disabled").text(theUILang.autotoolsFileOpType + ": "),
@@ -144,7 +143,7 @@ plugin.onLangLoaded = function() {
 				),
 				$("<div>").addClass("row").append(
 					$("<div>").addClass("col-1 justify-content-md-end").append(
-						$("<input>").attr({type:"checkbox", id:"enable_watch", onchange:"linked(this, 0, ['path_to_watch', 'autowatch_browse_btn', 'watch_start']);"}),
+						$("<input>").attr({type:"checkbox", id:"enable_watch", onchange:"linked(this, 0, ['path_to_watch', 'path_to_watch_btn', 'watch_start']);"}),
 					),
 					$("<div>").addClass("col-11 col-md-5").append(
 						$("<label>").attr({for:"enable_watch"}).text(theUILang.autotoolsEnableWatch),
@@ -156,7 +155,6 @@ plugin.onLangLoaded = function() {
 					),
 					$("<div>").addClass("col-11 offset-1 col-md-6 offset-md-0").append(
 						$("<input>").attr({type:"text", id:"path_to_watch", maxlength:100}),
-						$("<button>").attr({type:"button", id:"autowatch_browse_btn"}).addClass("browseButton").text("..."),
 					),
 					$("<div>").addClass("col-11 col-md-5 offset-1").append(
 						$("<input>").attr({type:"checkbox", id:"watch_start"}),
@@ -170,11 +168,8 @@ plugin.onLangLoaded = function() {
 			theUILang.autotools,
 		);
 		if (thePlugins.isInstalled("_getdir")) {
-			this.DirBrowser1 = new theWebUI.rDirBrowser("stg", "path_to_finished", "automove_browse_btn", "automove_browse_frame");
-			this.DirBrowser2 = new theWebUI.rDirBrowser("stg", "path_to_watch", "autowatch_browse_btn", "autowatch_browse_frame");
-		} else {
-			$('#automove_browse_btn').remove();
-			$('#autowatch_browse_btn').remove();
+			new theWebUI.rDirBrowser("path_to_finished");
+			new theWebUI.rDirBrowser("path_to_watch");
 		}
 	}
 }
diff --git a/plugins/create/init.js b/plugins/create/init.js
index 9294b7155..545aaf1c4 100644
--- a/plugins/create/init.js
+++ b/plugins/create/init.js
@@ -160,7 +160,6 @@ plugin.onLangLoaded = function()
 					$("<div>").addClass("row").append(
 						$("<div>").addClass("col-12 d-flex flex-row").append(
 							$("<input>").attr({type: "text", id: "path_edit", name: "path_edit", autocomplete: "off"}).addClass("flex-grow-1"),
-							$("<input>").attr({type: "button", id: "browse_path"}).addClass("Button").val("..."),
 						),
 					),
 				),
@@ -234,20 +233,9 @@ plugin.onLangLoaded = function()
 		{
 			$('#xgetfile').trigger('submit');
 		});
-		if(thePlugins.isInstalled("_getdir"))
-		{
-			plugin.btn = new theWebUI.rDirBrowser( 'tcreate', 'path_edit', 'browse_path', null, true, 375 );
-			theDialogManager.setHandler('tcreate','afterHide',function()
-			{
-				plugin.btn.hide();
-			});
+		if (thePlugins.isInstalled("_getdir")) {
+			new theWebUI.rDirBrowser("path_edit", true, 375);
 		}
-		else
-			$('#browse_path').remove();
-		theDialogManager.setHandler('tskConsole','beforeShow',function()
-		{
-			$('#xcsave').hide();
-		});
 		plugin.markLoaded();
 	}
 };
diff --git a/plugins/datadir/init.js b/plugins/datadir/init.js
index 3a8a2f980..2d9bf3376 100644
--- a/plugins/datadir/init.js
+++ b/plugins/datadir/init.js
@@ -171,16 +171,9 @@ plugin.onLangLoaded = function()
 		)[0].outerHTML,
 		true,
 	);
-	if(thePlugins.isInstalled("_getdir"))
-	{
-		var btn = new theWebUI.rDirBrowser( 'dlg_datadir', 'edit_datadir', 'btn_datadir_browse', 'frame_datadir_browse' );
-		theDialogManager.setHandler('dlg_datadir','afterHide',function()
-		{
-			btn.hide();
-		});
+	if (thePlugins.isInstalled("_getdir")) {
+		new theWebUI.rDirBrowser("edit_datadir");
 	}
-	else
-		$('#btn_datadir_browse').remove();
 }
 
 plugin.onRemove = function()
diff --git a/plugins/extsearch/init.js b/plugins/extsearch/init.js
index 4a6574874..be65c099f 100644
--- a/plugins/extsearch/init.js
+++ b/plugins/extsearch/init.js
@@ -783,15 +783,10 @@ plugin.onLangLoaded = function() {
 		)[0].outerHTML,
 		true,
 	);
-	if(thePlugins.isInstalled("_getdir"))
-	{
-		$('#tegdir_edit').after($("<input type=button>").addClass("Button").attr("id","tegBtn").on('focus', function() { this.blur(); } ));
-		var btn = new theWebUI.rDirBrowser( 'tegLoadTorrents', 'tegdir_edit', 'tegBtn' );
-		theDialogManager.setHandler('tegLoadTorrents','afterHide',function()
-		{
-			btn.hide();
-		});
+	if (thePlugins.isInstalled("_getdir")) {
+		new theWebUI.rDirBrowser("tegdir_edit");
 	}
+
 	const commonSettings = $("<fieldset>").append(
 		$("<legend>").text(theUILang.exsGlobalLimit),
 		$("<div>").addClass("row").append(
diff --git a/plugins/rss/init.js b/plugins/rss/init.js
index 6b9262bc8..0eb88df28 100644
--- a/plugins/rss/init.js
+++ b/plugins/rss/init.js
@@ -1540,16 +1540,9 @@ plugin.onLangLoaded = function()
 	);
 	$("#gcont").append( $("<div>").attr("id","rsslayout").css( "display", "none" ));
 
-	if(thePlugins.isInstalled("_getdir"))
-	{
-		$('#RSSdir_edit').after($("<input type=button>").addClass("Button").attr("id","RSSBtn").on('focus', function() { this.blur(); } ));
-		var btn = new theWebUI.rDirBrowser( 'dlgLoadTorrents', 'RSSdir_edit', 'RSSBtn' );
-		theDialogManager.setHandler('dlgLoadTorrents','afterHide',function()
-		{
-			btn.hide();
-		});
-		$('#FLTdir_edit').after($("<input type=button>").addClass("Button").attr("id","FLTBtn").on('focus', function() { this.blur(); } ));
-		plugin.editFilersBtn = new theWebUI.rDirBrowser( 'dlgEditFilters', 'FLTdir_edit', 'FLTBtn' );
+	if (thePlugins.isInstalled("_getdir")) {
+		new theWebUI.rDirBrowser("RSSdir_edit");
+		new theWebUI.rDirBrowser("FLTdir_edit");
 	}
 
 	thePlugins.isInstalled('throttle') && this.correctFilterDialog();
diff --git a/plugins/scheduler/init.js b/plugins/scheduler/init.js
index 25d53ef47..e101a08d8 100644
--- a/plugins/scheduler/init.js
+++ b/plugins/scheduler/init.js
@@ -109,7 +109,7 @@ if (plugin.canChangeOptions()) {
 				($$('restrictedDL' + (i + 1)).value != theWebUI.scheduleTable.DL[i]))
 					return true;
 		for (let day = 0; day < 7; day++)
-			for (let hour = 1; hour < 25; hour++)
+			for (let hour = 0; hour < 24; hour++)
 				if ($(`.day-${day}.hour-${hour}`).attr("clr") !== theWebUI.scheduleTable.week[day][hour])
 					return true;
 		return false;
@@ -142,10 +142,9 @@ if (plugin.canChangeOptions()) {
 
 	var schClasses = [ "sch_fast", "sch_stop", "sch_seed", "sch_res1", "sch_res2", "sch_res3" ];
 
-	theWebUI.schMouseOver = function(i,j)
-	{
-		var from = (j < 10) ? ("0" + j) : j;
-		$('#sch_desc').text( theUILang.schFullWeek[i]+', '+from+':00 - '+from+':59' );
+	theWebUI.schMouseOver = function(day, hour) {
+		const from = (hour < 10) ? ("0" + hour) : hour;
+		$('#sch_desc').text( theUILang.schFullWeek[day]+', '+from+':00 - '+from+':59' );
 	}
 
 	theWebUI.schLegendMouseOver = function(i)
@@ -159,15 +158,13 @@ if (plugin.canChangeOptions()) {
 		$('#sch_desc').html('&nbsp;');
 	}
 
-	theWebUI.schClick = function(obj,i,j)
-	{
-		if($$('sch_enable').checked)
-		{
-			var clr = parseInt(obj.getAttribute("clr"))+1;
-			if(clr>=schClasses.length)
+	theWebUI.schClick = function(obj, day, hour) {
+		if ($$('sch_enable').checked) {
+			let clr = parseInt(obj.getAttribute("clr")) + 1;
+			if (clr >= schClasses.length)
 				clr = 0;
-			obj.className = schClasses[clr];
-			obj.setAttribute("clr",clr);
+			obj.className = schClasses[clr] + ` day-${day} hour-${hour}`;
+			obj.setAttribute("clr", clr);
 		}
 	}
 
@@ -222,15 +219,16 @@ plugin.onLangLoaded = function() {
 								$("<span>").addClass("sch-week").text(theUILang.schShortWeek[day]),
 							),
 							$("<div>").addClass("col-10 col-md-11 row flex-grow-1 mb-1 mb-md-0").append(
-								...["am", "pm"].map(_ => $("<div>").addClass("col-12 col-md-6 align-items-stretch").append(
+								...[0, 1].map(dayHalf => $("<div>").addClass("col-12 col-md-6 align-items-stretch").append(
 									...Array.from(Array(12).keys()).map(hour => {
-										const clr = theWebUI.scheduleTable.week[day][hour];
+										const hour24 = hour + 12 * dayHalf;
+										const clr = theWebUI.scheduleTable.week[day][hour24];
 										return $("<span>").attr({
-											clr,
-											onmouseover: `theWebUI.schMouseOver("${day}","${hour}")`,
+											clr: clr ?? 0,
+											onmouseover: `theWebUI.schMouseOver(${day}, ${hour24})`,
 											onmouseout: "theWebUI.schMouseOut();",
-											onclick: `theWebUI.schClick(this, "${day}","${hour}");`,
-										}).addClass(`${schClasses[clr]}dis day-${day} hour-${hour}`);
+											onclick: `theWebUI.schClick(this, ${day}, ${hour24});`,
+										}).addClass(`${schClasses[clr] ?? "sch_fast"}dis day-${day} hour-${hour24}`);
 									}),
 								)),
 							),
diff --git a/plugins/theme/themes/Acid/plugins.css b/plugins/theme/themes/Acid/plugins.css
index bcb27162e..3ef043e92 100644
--- a/plugins/theme/themes/Acid/plugins.css
+++ b/plugins/theme/themes/Acid/plugins.css
@@ -1,3 +1,7 @@
+.browseFrame {
+  border: 1px solid #909090;
+  background-color: #1E2124;
+}
 div#create_btns {background-image: url(./images/ajax-loader_h.gif)}
 #meter-disk-td, #qmeter-disk-td {background-image: url(./images/disk.gif)}
 div#t div#starter {background-image: url(./images/starter.png)}
@@ -16,4 +20,4 @@ div#dlgLoadTorrents div.dlg-header {background-image: url(./images/world.gif)}
 .shiodd {background: #323A46; }
 
 .lf_rur li input.TextboxFocus {background-color: #BDDBDB; color: #272E36;}
-.lf_rur li input.TextboxNormal {background-color: #272E36; color: #BDDBDB;}
\ No newline at end of file
+.lf_rur li input.TextboxNormal {background-color: #272E36; color: #BDDBDB;}
diff --git a/plugins/theme/themes/Dark/plugins.css b/plugins/theme/themes/Dark/plugins.css
index 04d33fbd6..d9c0dbbb5 100644
--- a/plugins/theme/themes/Dark/plugins.css
+++ b/plugins/theme/themes/Dark/plugins.css
@@ -1,7 +1,11 @@
+.browseFrame {
+  border: 1px solid #888888;
+  background-color: #999999;
+}
 .tskconsole, .exconsole, .console, .starterConsole {background: #333333}
 .cCell {color: black; border-color: #888888}
 
 .shieven {background: #333333; }
 .shiodd {background: #191919; }
 
-.Cell0 { border: 1px dotted #888888; }
\ No newline at end of file
+.Cell0 { border: 1px dotted #888888; }
diff --git a/plugins/theme/themes/DarkBetter/plugins.css b/plugins/theme/themes/DarkBetter/plugins.css
index c5acd5a9f..536416197 100644
--- a/plugins/theme/themes/DarkBetter/plugins.css
+++ b/plugins/theme/themes/DarkBetter/plugins.css
@@ -1,3 +1,7 @@
+.browseFrame {
+  border: 1px solid #888888;
+  background-color: #999999;
+}
 .tskconsole, .exconsole, .console, .starterConsole {background: #333333}
 .cCell {color: black; border-color: #888888}
 
diff --git a/plugins/theme/themes/MaterialDesign/plugins.css b/plugins/theme/themes/MaterialDesign/plugins.css
index 942a9209f..9ee454ba7 100644
--- a/plugins/theme/themes/MaterialDesign/plugins.css
+++ b/plugins/theme/themes/MaterialDesign/plugins.css
@@ -1,11 +1,14 @@
-
 @font-face {
-    font-family: 'Ubuntu';
-    font-style: normal;
-    font-weight: 400;
-    src: local('Ubuntu'), url(https://themes.googleusercontent.com/static/fonts/ubuntu/v5/_xyN3apAT_yRRDeqB3sPRg.woff) format('woff');
+  font-family: 'Ubuntu';
+  font-style: normal;
+  font-weight: 400;
+  src: local('Ubuntu'), url(https://themes.googleusercontent.com/static/fonts/ubuntu/v5/_xyN3apAT_yRRDeqB3sPRg.woff) format('woff');
 }
 
+.browseFrame {
+  border: 1px solid #161F25;
+  background-color: #273238;
+}
 .tskconsole, .exconsole, .console, .starterConsole { background: #333333 }
 #tsk_btns input.Button {
   margin: 0px 3px
diff --git a/plugins/theme/themes/MaterialDesign/style.css b/plugins/theme/themes/MaterialDesign/style.css
index 7e7c3c400..ec79fd7f4 100644
--- a/plugins/theme/themes/MaterialDesign/style.css
+++ b/plugins/theme/themes/MaterialDesign/style.css
@@ -703,30 +703,19 @@ table#maincont td.uicell {
 div#HDivider, div#VDivider {background:#141414;}
 div#HDivider:hover, div#VDivider:hover {background:#334550}
 
-div#tcreate textarea#trackers
-{
-	color:#fff;
-	border:none!important;
-	background:#6F6F6F;
-	border-radius:2px;
-	cursor:text
-}
-
-input[type="number"],input[type="text"],input[type="password"],select
-{
-	color:#fff;
-	border:none;
-	background:#6F6F6F url(./images/headers.png) repeat-x scroll 0 -138px;
-	border-radius:2px
+input[type="number"],input[type="text"],input[type="password"],select {
+	color: #fff;
+	border: none;
+	background-color: #6F6F6F;
+	border-radius: 2px;
 }
 
-input[type="number"][disabled],input[type="text"][disabled],input[type="password"][disabled],input[type="file"][disabled],select[disabled]
-{
-	color:#fff;
-	border:none;
-	background:#6F6F6F url(./images/headers.png) repeat scroll 0 0!important;
-	border-radius:2px;
-	opacity:.2
+input[type="number"][disabled],input[type="text"][disabled],input[type="password"][disabled],input[type="file"][disabled],select[disabled] {
+	color: #fff;
+	border: none;
+	background-color: #6F6F6F;
+	border-radius: 2px;
+	opacity: .2;
 }
 
 #StatusBar table tr td.pstatus2
@@ -734,21 +723,16 @@ input[type="number"][disabled],input[type="text"][disabled],input[type="password
 	background:transparent url(./images/green.png) no-repeat scroll 5px center!important
 }
 
-textarea
-{
-	border:none;
-	border-radius:2px
-}
-
-#hostcookies,#lookat,#message,#FS_downlink
-{
-	color:#fff;
-	border:none!important;
-	background:#6F6F6F;
-	border-radius:2px
+textarea {
+	border: none;
+	border-radius: 2px;
+	color: #fff;
+	border: none!important;
+	background: #6F6F6F;
+	border-radius: 2px;
 }
 
-button, input[type=button], input.Button:not([disabled]):focus, .Button {
+button, input[type=button], input[type=submit], input.Button:not([disabled]):focus, .Button {
 	background: #3498db none repeat scroll 0 0;
 	border-radius:2px;
 	border:none;
@@ -797,9 +781,7 @@ input[type="checkbox"]:checked
 
 input[type="checkbox"]:checked::after {
 	position: relative;
-	left: -2px;
-	font-size: 12px;
-	line-height: 12px;
+	left: 3px;
 	content: "✔";
 	color: #fff;
 	text-shadow: #2980b9 0px 1px;
@@ -964,13 +946,6 @@ div#dlgHelp-header,div#dlgHelp div.dlg-header
 	text-shadow:0 -1px 0 #000
 }
 
-div#tadd
-{
-	margin:5px;
-	height:300px!important;
-	width:450px!important
-}
-
 div#tadd-header
 {
 	background:#181818 url(./images/dlg-toolbars.gif) no-repeat 0 0;
@@ -978,37 +953,6 @@ div#tadd-header
 	text-shadow:0 -1px 0 #000
 }
 
-#addtorrenturl label:nth-of-type(2),#addtorrenturl br,#addtorrent label:last-of-type,#addtorrent br:last-of-type,#addtorrent br:nth-last-of-type(2)
-{
-	display:none!important
-}
-
-#addtorrent hr:last-of-type
-{
-	margin-bottom:15px
-}
-
-#tadd_label,#tadd_label_select
-{
-	margin:5px 0 5px 25px
-}
-
-#addtorrent span,#addtorrent label,#tadd_label_select,#tadd_label
-{
-	clear:both;
-	float:left
-}
-
-#addtorrent span:first-of-type,#addtorrent label:nth-of-type(2)
-{
-	margin-top:10px
-}
-
-#addtorrenturl
-{
-	margin-top:15px
-}
-
 Input.TextboxLarge
 {
 	border:none
@@ -1077,11 +1021,6 @@ span#loadimg
 	background-color:#343434
 }
 
-input#clear_log,input#add_url,input#add_button
-{
-	margin-top:2px
-}
-
 div#lcont div.std
 {
 	background:#181818 url(./images/headers.png) repeat-x 0 -37px;
diff --git a/plugins/theme/themes/Oblivion/plugins.css b/plugins/theme/themes/Oblivion/plugins.css
index e92285bae..12398fbd3 100644
--- a/plugins/theme/themes/Oblivion/plugins.css
+++ b/plugins/theme/themes/Oblivion/plugins.css
@@ -1,3 +1,7 @@
+.browseFrame {
+  border: 1px solid #757571;
+  background-color: #181818;
+}
 .tskconsole, .exconsole, .console, .starterConsole {background: #333333}
 .cCell {color: black}
 #meter-disk-value {
diff --git a/plugins/theme/themes/Oblivion/style.css b/plugins/theme/themes/Oblivion/style.css
index ded8e42d4..4b069e832 100644
--- a/plugins/theme/themes/Oblivion/style.css
+++ b/plugins/theme/themes/Oblivion/style.css
@@ -12,7 +12,7 @@ html, body {font-family: "Lucida Sans Unicode", "Lucida Grande", Tahoma, Arial,
   --settings-background-color: #181818;
 }
 
-button, input[type=button], .Button {
+button, input[type=button], input[type=submit], .Button {
   border: 1px solid #000;
   background: #000 url(./images/headers.png) repeat-x 0px 0px;
   color:#AACF27;
@@ -277,10 +277,8 @@ div#stg-header {background: #181818 url(./images/dlg-toolbars.gif) no-repeat 0px
 div#stg .lm {background-color: #181818; border: 1px solid #333333}
 div#dlgHelp-header,div#dlgHelp div.dlg-header {background: #181818 url(./images/dlg-toolbars.gif) no-repeat 0px -96px;text-shadow:0px -1px 0px #000;}
 
-div#tadd { margin:5px; }
 div#tadd-header {background: #181818 url(./images/dlg-toolbars.gif) no-repeat 0px 0px; border-bottom: 1px solid #333333;text-shadow:0px -1px 0px #000;}
 
-
 div.tab {background-color: #181818}
 
 div#t div#ind {background: transparent url(./images/ajax-loader.gif) no-repeat 0px center;}
@@ -315,7 +313,6 @@ background-color: #343434;
 -webkit-border-radius: 6px;
 }
 /* LOG */
-input#clear_log,input#add_url, input#add_button {margin-top:2px;}
 div#lcont div.std {background: #181818 url(./images/headers.png) repeat-x 0px -37px;height:17px;line-height:17px;border-bottom: 1px solid #333333;}
 div#lcont div.std:nth-child(2n+1) {background: #181818 url(./images/headers.png) repeat-x 0px -64px;}
 
diff --git a/plugins/unpack/init.js b/plugins/unpack/init.js
index c2893fb0f..421b42d6b 100644
--- a/plugins/unpack/init.js
+++ b/plugins/unpack/init.js
@@ -91,7 +91,7 @@ if (plugin.canChangeOptions()) {
 			$('#unpack_name').prop('checked',(theWebUI.unpackData.addName == 1));
 			$('#edit_unpack1').val( theWebUI.unpackData.path );
 			$('#edit_filter').val( theWebUI.unpackData.filter );
-			linked($$('unpack_enabled'), 0, ['edit_filter', 'edit_unpack1', 'btn_unpack1']);
+			linked($$('unpack_enabled'), 0, ['edit_filter', 'edit_unpack1', 'edit_unpack1_btn'] );
 			if (plugin.btn)
 				plugin.btn.hide();
 		}
@@ -176,7 +176,7 @@ plugin.onLangLoaded = function()
 					$("<legend>").text(theUILang.unpackPath),
 					$("<div>").addClass("row").append(
 						$("<div>").addClass("col-12").append(
-							$("<input>").attr({type:"checkbox", id:"unpack_enabled", onchange:"linked(this, 0, ['edit_filter', 'edit_unpack1', 'btn_unpack1']);"}),
+							$("<input>").attr({type:"checkbox", id:"unpack_enabled", onchange:"linked(this, 0, ['edit_filter', 'edit_unpack1', 'edit_unpack1_btn']);"}),
 							$("<label>").attr({for:"unpack_enabled"}).text(theUILang.unpackEnabled),
 						),
 						$("<div>").addClass("col-12").append(
@@ -184,7 +184,6 @@ plugin.onLangLoaded = function()
 						),
 						$("<div>").addClass("col-12").append(
 							$("<input>").attr({type:"text", id:"edit_unpack1", maxlength:200}),
-							$("<button>").attr({type:"button", id:"btn_unpack1"}).addClass("browseButton").text("..."),
 						),
 					),
 				),
@@ -205,15 +204,10 @@ plugin.onLangLoaded = function()
 		);
 		$('#edit_unpack').val( theWebUI.unpackData.path );
 		if (thePlugins.isInstalled("_getdir")) {
-			const btn = new theWebUI.rDirBrowser('dlg_unpack', 'edit_unpack', 'btn_unpack');
-			theDialogManager.setHandler('dlg_unpack', 'afterHide', function() {
-				btn.hide();
-			});
-			if (plugin.canChangeOptions())
-				plugin.btn = new theWebUI.rDirBrowser('stg', 'edit_unpack1', 'btn_unpack1');
-		} else {
-			$('#btn_unpack').remove();
-			$('#btn_unpack1').remove();
+			new theWebUI.rDirBrowser("edit_unpack");
+			if (plugin.canChangeOptions()) {
+				new theWebUI.rDirBrowser("edit_unpack1");
+			}
 		}
 		plugin.markLoaded();
 	}