diff --git a/ChangeLog b/ChangeLog
index ab6941599589f8cb7eeb7a8392edee8ffbf652b5..f5e2000ca46ff72b9f1016b7ef95de7677c63e42 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 CVS Code -
+- global.c:
+	- Define currshortcut and currslen when either DISABLE_MOUSE
+	  or DISABLE_BROWSER is not defined (Silvan Minghetti).
 - nano.c:
   main()
 	- Add Esc-[-[IGL] keys for FreeBSD Console (PgUp,PgDn,Insert).
diff --git a/global.c b/global.c
index cac1b63dcc6bd4f44a2016550e776ea87958640c..ed1ed7cdc08b6aba6feb0326a7b958c81cce7dc7 100644
--- a/global.c
+++ b/global.c
@@ -102,7 +102,7 @@ shortcut browser_list[BROWSER_LIST_LEN];
     colorstruct colors[NUM_NCOLORS];
 #endif
 
-#ifndef DISABLE_MOUSE
+#if !defined(DISABLE_BROWSER) || !defined(DISABLE_MOUSE)
 shortcut *currshortcut = main_list;	/* Current shortcut list we're using */
 int currslen = MAIN_VISIBLE;		/* Length of current shortcut list */
 #endif