diff --git a/src/gui/views/listview.py b/src/gui/views/listview.py
index 1a5e596f4..0ed53eb8a 100644
--- a/src/gui/views/listview.py
+++ b/src/gui/views/listview.py
@@ -691,9 +691,8 @@ class ListView(NavigationView):
             _LOG.debug('   ' + self.__class__.__name__ + ' row_update ' +
                     str(time.clock() - cput) + ' sec')
             # Ensure row is still selected after a change of postion in tree.
-            if not self.selected_handles():
-                if len(handle_list) > 0:
-                    self.goto_handle(handle_list[-1])
+            if handle_list and not self.selected_handles():
+                self.goto_handle(handle_list[-1])
         else:
             self.dirty = True
 
diff --git a/src/plugins/drawreport/StatisticsChart.py b/src/plugins/drawreport/StatisticsChart.py
index 85120b2bd..864e295a3 100644
--- a/src/plugins/drawreport/StatisticsChart.py
+++ b/src/plugins/drawreport/StatisticsChart.py
@@ -838,7 +838,7 @@ class StatisticsChart(Report):
         pad =  row_h * 0.5
         
         # check maximum value
-        max_value = reduce(max, map(data.get, lookup), 0)
+        max_value = max(data[k] for k in lookup) if data else 0
         # horizontal area for the gfx bars
         margin = 1.0
         middle = width/2.0