diff --git a/resources/views/common_scripts.blade.php b/resources/views/common_scripts.blade.php
index 236c114..46560c5 100644
--- a/resources/views/common_scripts.blade.php
+++ b/resources/views/common_scripts.blade.php
@@ -15,10 +15,5 @@
 {{-- elFinder JS (REQUIRED) --}}
 @basset(base_path('vendor/studio-42/elfinder/js/elfinder.min.js'))
 
-{{-- elFinder translation (OPTIONAL) --}}
-@if($locale)
-	@basset('bp-elfinder-i18n-'.$locale)
-@endif
-
 {{-- elFinder sounds --}}
 @basset(base_path('vendor/studio-42/elfinder/sounds/rm.wav'))
diff --git a/resources/views/elfinder.blade.php b/resources/views/elfinder.blade.php
index b1ff684..2878714 100644
--- a/resources/views/elfinder.blade.php
+++ b/resources/views/elfinder.blade.php
@@ -26,6 +26,12 @@
     <script type="text/javascript" charset="utf-8">
         // Documentation for client options:
         // https://github.com/Studio-42/elFinder/wiki/Client-configuration-options
+        
+        // elFinder does not fully support jQuery UI 1.13+ yet, so we need to add this workaround.
+        if (typeof $.fn.buttonset !== 'function' && typeof $.fn.controlgroup === 'function') {
+            $.fn.buttonset = $.fn.controlgroup;
+        }
+
         $(document).ready(function() {
             $('#elfinder').elfinder({
                 // set your elFinder options here
diff --git a/src/BackpackElfinderController.php b/src/BackpackElfinderController.php
index 334e616..afca708 100644
--- a/src/BackpackElfinderController.php
+++ b/src/BackpackElfinderController.php
@@ -2,7 +2,6 @@
 
 namespace Backpack\FileManager;
 
-use Backpack\Basset\Facades\Basset;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\Log;
 
@@ -49,14 +48,15 @@ public function showIndex()
 
     protected function getViewVars()
     {
+        $dir = 'packages/barryvdh/'.$this->package;
         $locale = str_replace('-', '_', $this->app->config->get('app.locale'));
 
-        if (! array_key_exists('bp-elfinder-i18n-'.$locale, Basset::getNamedAssets())) {
+        if (! file_exists(base_path("vendor/studio-42/elfinder/js/i18n/elfinder.{$locale}.js"))) {
             $locale = false;
         }
 
         $csrf = true;
 
-        return compact('locale', 'csrf');
+        return compact('dir', 'locale', 'csrf');
     }
 }