1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/Goals/Controller.php b/plugins/Goals/Controller.php
index 65496bad69..6a65135230 100644
--- a/plugins/Goals/Controller.php
+++ b/plugins/Goals/Controller.php
@@ -289,7 +289,7 @@ class Controller extends \Piwik\Plugin\Controller
         }
 
         $topDimensionsToLoad += array(
-            'entry_page' => 'Goals.getPagesEntry',
+            'entry_page' => 'Actions.getEntryPageUrls',
         );
 
         $topDimensions = array();
@@ -301,7 +301,8 @@ class Controller extends \Piwik\Plugin\Controller
                                    &filter_sort_order=desc
                                    &filter_sort_column=$columnNbConversions" .
                 // select a couple more in case some are not valid (ie. conversions==0 or they are "Keyword not defined")
-                "&filter_limit=" . (self::COUNT_TOP_ROWS_TO_DISPLAY + 2));
+                "&filter_limit=" . (self::COUNT_TOP_ROWS_TO_DISPLAY + 2).
+                ($dimensionName == 'entry_page' ? '&$includeGoals=1' : ''));
             $datatable = $request->process();
             $topDimension = array();
             $count = 0;