2 files changed, 2 insertions, 0 deletions
diff --git a/src/capi.c b/src/capi.c
index 5e2928e3..867083b5 100644
--- a/src/capi.c
+++ b/src/capi.c
@@ -758,6 +758,7 @@ void a_Capi_ccc(int Op, int Branch, int Dir, ChainLink *Info,
             a_Chain_bcb(OpAbort, Info, NULL, NULL);
             /* remove the cache entry for this URL */
             a_Cache_entry_remove_by_url(conn->url);
+            a_Nav_cancel_expect_if_eq(conn->bw, conn->url);
             Capi_conn_unref(conn);
             dFree(Info);
             break;
diff --git a/src/nav.c b/src/nav.c
index f7aa26c9..31f9e92d 100644
--- a/src/nav.c
+++ b/src/nav.c
@@ -252,6 +252,7 @@ void a_Nav_cancel_expect(BrowserWindow *bw)
       a_Url_free(bw->nav_expect_url);
       bw->nav_expect_url = NULL;
       bw->nav_expecting = FALSE;
+      a_UIcmd_set_buttons_sens(bw);
    }
    if (bw->meta_refresh_status > 0)
       --bw->meta_refresh_status;