diff --git a/ChangeLog b/ChangeLog
index 3bfdbcd46..11829474c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,6 +21,8 @@ $HeadURL$
       #1465906).
     * libraries/export/sql.php: Keep 0 in exported auto_increment fields (bug
       #1440544).
+    * js/navigation.js: Fix setting of navigation width when using RTL lang
+      (bug #1579750).
 
 2006-10-17 Marc Delisle  <lem9@users.sourceforge.net>
     * export.php: export nothing if no tables are selected
diff --git a/js/navigation.js b/js/navigation.js
index 9a8fe705d..80a9fff2d 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -1,3 +1,4 @@
+// vim: expandtab sw=4 ts=4 sts=4:
 var today = new Date();
 var expires = new Date(today.getTime() + (56 * 86400000));
 var pma_navi_width;
@@ -79,7 +80,11 @@ function PMA_setFrameSize()
     pma_navi_width = PMA_getCookie('pma_navi_width');
     //alert('from cookie: ' + typeof(pma_navi_width) + ' : ' + pma_navi_width);
     if (pma_navi_width != null) {
-        parent.document.getElementById('mainFrameset').cols = pma_navi_width + ',*';
+	    if (parent.document.getElementById('text_dir') == 'ltr) {
+            parent.document.getElementById('mainFrameset').cols = pma_navi_width + ',*';
+        } else {
+            parent.document.getElementById('mainFrameset').cols = '*,' + pma_navi_width;
+        }
         //alert('framesize set');
     }
 }
@@ -122,4 +127,4 @@ function PMA_setCookie(name, value, expires, path, domain, secure) {
         ( (path)    ? ";path=" + path : "") +
         ( (domain)  ? ";domain=" + domain : "") +
         ( (secure)  ? ";secure" : "");
-}
\ No newline at end of file
+}