diff --git a/c/Hotlist b/c/Hotlist
index 72aaa3699d2be801ddc49832c0cf4a76fa5b0952..a31d0942fd2b5770e27f0b573ea7cc0074ecd3d5 100644
--- a/c/Hotlist
+++ b/c/Hotlist
@@ -3739,7 +3739,6 @@ static int hotlist_newren_directory_handler(int event_code, ToolboxEvent *event,
     hotlist_preopen();
     hotlist_redraw_now();
     hotlist_modified(HL_MODIFIED_ALTER);
-    //toolbox_hide_object(0, id_block->ancestor_id);
     break;
 
   }
@@ -4466,6 +4465,7 @@ _kernel_oserror *hotlist_autoscroll(int window)
       {
         mouse_shape = Mouse_Shape_Normal;
         mouse_set_pointer_shape(Mouse_Shape_Normal);
+        scrolling = 0;
       }
     }
   }
@@ -5185,7 +5185,7 @@ _kernel_oserror * hotlist_add_position(int x, int y, char *description, char *ur
   winy = coords_y_toworkarea(y, (WimpRedrawWindowBlock *) &state);
 
   /* Calculate which item add is over */
-  hotlist_get_entry_sizes(&item_height, &item_dir_width, &item_url_width);
+  RetError(hotlist_get_entry_sizes(&item_height, &item_dir_width, &item_url_width));
   targetitem = hotlist_find_item(hotlist_root->data.directory_content, -winy/item_height);
   top = -winy/item_height;