diff --git a/VersionNum b/VersionNum
index b478d25a753bb1e246f93f39146e577e95c4bcca..855387d7d4de6ae6f5ca9b7035e1c8edc0415f53 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.40)
+/* (0.41)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.40
+#define Module_MajorVersion_CMHG        0.41
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                28 Nov 2015
+#define Module_Date_CMHG                25 Mar 2016
 
-#define Module_MajorVersion             "0.40"
-#define Module_Version                  40
+#define Module_MajorVersion             "0.41"
+#define Module_Version                  41
 #define Module_MinorVersion             ""
-#define Module_Date                     "28 Nov 2015"
+#define Module_Date                     "25 Mar 2016"
 
-#define Module_ApplicationDate          "28-Nov-15"
+#define Module_ApplicationDate          "25-Mar-16"
 
 #define Module_ComponentName            "Gadgets"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Toolbox/Gadgets"
 
-#define Module_FullVersion              "0.40"
-#define Module_HelpVersion              "0.40 (28 Nov 2015)"
-#define Module_LibraryVersionInfo       "0:40"
+#define Module_FullVersion              "0.41"
+#define Module_HelpVersion              "0.41 (25 Mar 2016)"
+#define Module_LibraryVersionInfo       "0:41"
diff --git a/c/ScrollList b/c/ScrollList
index 5b79119cd6a837e0beae000b4d1bdb6d4a6a2ae9..59d5580a33e92507af2ba0058509b654055b3e60 100644
--- a/c/ScrollList
+++ b/c/ScrollList
@@ -1456,6 +1456,10 @@ static _kernel_oserror *scrolllist_mclick(const PrivateScrollList *sdata,
 
     event_item = -mouse_y / item_height;
 
+    /* SNB: 19980518: changed condition to >= to stop "extra item" events. */
+    if (event_item >= sdata->no_entries)
+        return NULL;
+
     if (click->buttons >= 256)
     {
         if ((click->buttons / 256) & (1<<0))
@@ -1470,11 +1474,6 @@ static _kernel_oserror *scrolllist_mclick(const PrivateScrollList *sdata,
     }
 
     // Send event -
-    /* SNB: 19980518: changed condition to >= to stop "extra item" events. */
-
-    if (event_item >= sdata->no_entries)
-        return NULL;
-
     event_flags = 0;
 
     if (click->buttons < 16)