diff --git a/src/ChangeLog b/src/ChangeLog
index 7440666dbc..2b44c46b54 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-21  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* lyx_main.C: fix binding of tabulator key (especially S-Tab).
+
 2005-03-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* lyx_main.C (queryUserLyXDir): fix logic when LyX support
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 568bc78994..c4ef46a484 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,6 @@
+2005-03-21  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+	* insettabular.C (getStatus): enable tabulator keys (bug 1836).
 
 2005-03-21  Alfredo Braunstein  <abraunst@lyx.org>
 
diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 9b929b4c11..1a351fb2b3 100644
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -968,6 +968,12 @@ bool InsetTabular::getStatus(LCursor & cur, FuncRequest const & cmd,
 		return true;
 	}
 
+	// These are only enabled inside tabular
+	case LFUN_CELL_BACKWARD:
+	case LFUN_CELL_FORWARD:
+		status.enabled(true);
+			return true;
+	
 	// disable these with multiple cells selected
 	case LFUN_INSERT_CHARSTYLE:
 	case LFUN_INSET_FLOAT:
diff --git a/src/lyx_main.C b/src/lyx_main.C
index 93387d5009..055aeee298 100644
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -525,7 +525,9 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 	kbmap->bind("Down", FuncRequest(LFUN_DOWN));
 
 	kbmap->bind("Tab", FuncRequest(LFUN_CELL_FORWARD));
-	kbmap->bind("ISO_Left_Tab", FuncRequest(LFUN_CELL_FORWARD));
+	kbmap->bind("C-Tab", FuncRequest(LFUN_CELL_SPLIT));
+	kbmap->bind("~S-ISO_Left_Tab", FuncRequest(LFUN_CELL_BACKWARD));
+	kbmap->bind("~S-BackTab", FuncRequest(LFUN_CELL_BACKWARD));
 
 	kbmap->bind("Home", FuncRequest(LFUN_HOME));
 	kbmap->bind("End", FuncRequest(LFUN_END));
@@ -564,10 +566,6 @@ void LyX::defaultKeyBindings(kb_keymap  * kbmap)
 	kbmap->bind("KP_End", FuncRequest(LFUN_END));
 	kbmap->bind("KP_Prior", FuncRequest(LFUN_PRIOR));
 	kbmap->bind("KP_Next", FuncRequest(LFUN_NEXT));
-
-	kbmap->bind("C-Tab", FuncRequest(LFUN_CELL_SPLIT));
-	kbmap->bind("S-Tab", FuncRequest(LFUN_CELL_BACKWARD));
-	kbmap->bind("S-ISO_Left_Tab", FuncRequest(LFUN_CELL_BACKWARD));
 }