4 files changed, 6 insertions, 2 deletions

diff --git a/res/about/version.gmi b/res/about/version.gmi
index adfbc43a..f11cda73 100644
--- a/res/about/version.gmi
+++ b/res/about/version.gmi
@@ -7,6 +7,7 @@
 # Release notes
 
 ## 0.8
+* Added keybindings for Back/Forward navigation.
 * ${CTRL+}Click opens tab in background, ${SHIFT+}${CTRL+}Click opens as foreground tab. The same modifier keys work with keyboard navigation.
 * Improved word wrapping of emoticons (:D).
 * Windows: Fixed handling of drag'n'dropped and command line file paths.
diff --git a/src/ui/bindingswidget.c b/src/ui/bindingswidget.c
index 82763416..23fbbe88 100644
--- a/src/ui/bindingswidget.c
+++ b/src/ui/bindingswidget.c
@@ -180,7 +180,7 @@ static void draw_BindingItem_(const iBindingItem *d, iPaint *p, iRect itemRect,
                    fg,
                    range_String(&d->label));
     drawAlign_Text(d->isWaitingForEvent ? uiContent_FontId : font,
-                   init_I2(right_Rect(itemRect) - 3 * gap_UI,
+                   init_I2(right_Rect(itemRect) - 6 * gap_UI,
                            y - (lineHeight_Text(uiContent_FontId) - line) / 2),
                    fg,
                    right_Alignment,
diff --git a/src/ui/keys.c b/src/ui/keys.c
index 04b4793b..d759d40e 100644
--- a/src/ui/keys.c
+++ b/src/ui/keys.c
@@ -65,6 +65,8 @@ static void bindDefaults_(void) {
     bindLabel_Keys(11, "scroll.step arg:1", SDLK_DOWN, 0, "Scroll down");
     bindLabel_Keys(20, "scroll.page arg:-1", SDLK_PAGEUP, 0, "Scroll up half a page");
     bindLabel_Keys(21, "scroll.page arg:1", SDLK_PAGEDOWN, 0, "Scroll down half a page");
+    bindLabel_Keys(30, "navigate.back", navigateBack_KeyShortcut, "Navigate back");
+    bindLabel_Keys(31, "navigate.forward", navigateForward_KeyShortcut, "Navigate forward");
     /* The following cannot currently be changed (built-in duplicates). */
     bind_Keys(1000, "scroll.page arg:-1", SDLK_SPACE, KMOD_SHIFT);
     bind_Keys(1001, "scroll.page arg:1", SDLK_SPACE, 0);
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index b4ba79fe..9c489123 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -293,7 +293,7 @@ void init_LabelWidget(iLabelWidget *d, const char *label, const char *cmd) {
     setFlags_Widget(&d->widget, hover_WidgetFlag, d->click.button != 0);
     d->alignVisual = iFalse;
     updateSize_LabelWidget(d);
-    updateKey_LabelWidget_(d);
+    updateKey_LabelWidget_(d); /* could be bound to another key */
 }
 
 void deinit_LabelWidget(iLabelWidget *d) {
@@ -342,6 +342,7 @@ iLabelWidget *newKeyMods_LabelWidget(const char *label, int key, int kmods, cons
     iLabelWidget *d = new_LabelWidget(label, command);
     d->key = key;
     d->kmods = kmods;
+    updateKey_LabelWidget_(d); /* could be bound to a different key */
     return d;
 }