diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-06.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-06.sql
new file mode 100644
index 0000000000000..b265025b2c16c
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-06-06.sql
@@ -0,0 +1,9 @@
+CREATE TABLE IF NOT EXISTS `#__finder_logging` (
+  `searchterm` VARCHAR(255) NOT NULL DEFAULT '',
+  `md5sum` VARCHAR(32) NOT NULL DEFAULT '',
+  `query` BLOB NOT NULL,
+  `hits` INT(11) NOT NULL DEFAULT '1',
+  `results` INT(11) NOT NULL DEFAULT '0',
+  UNIQUE INDEX `md5sum` (`md5sum`),
+  INDEX `searchterm` (`searchterm`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-06.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-06.sql
new file mode 100644
index 0000000000000..c0368b06a5530
--- /dev/null
+++ b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-06-06.sql
@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS "#__finder_logging" (
+  "searchterm" character varying(255) NOT NULL DEFAULT '',
+  "md5sum" character varying(32) NOT NULL DEFAULT '',
+  "query" bytes NOT NULL,
+  "hits" integer NOT NULL DEFAULT 1,
+  "results" integer NOT NULL DEFAULT 0,
+  CONSTRAINT "#__finder_logging_idx_md5sum" UNIQUE ("md5sum")
+);
+CREATE INDEX "#__finder_logging_idx_md5sum" on "#__finder_logging" ("md5sum");
+CREATE INDEX "#__finder_logging_idx_searchterm" on "#__finder_logging" ("searchterm");
diff --git a/administrator/components/com_finder/Controller/SearchesController.php b/administrator/components/com_finder/Controller/SearchesController.php
new file mode 100644
index 0000000000000..734f5b5823655
--- /dev/null
+++ b/administrator/components/com_finder/Controller/SearchesController.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\Component\Finder\Administrator\Controller;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\MVC\Controller\BaseController;
+
+/**
+ * Methods supporting a list of search terms.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class SearchesController extends BaseController
+{
+	/**
+	 * Method to reset the search log table.
+	 *
+	 * @return  boolean
+	 */
+	public function reset()
+	{
+		// Check for request forgeries.
+		\JSession::checkToken() or jexit(\JText::_('JINVALID_TOKEN'));
+
+		$model = $this->getModel('Searches');
+
+		if (!$model->reset())
+		{
+			$this->app->enqueueMessage($model->getError(), 'error');
+		}
+
+		$this->setRedirect('index.php?option=com_finder&view=searches');
+	}
+}
diff --git a/administrator/components/com_finder/Helper/FinderHelper.php b/administrator/components/com_finder/Helper/FinderHelper.php
index b7bc2f732e271..2dcc2b40efa6f 100644
--- a/administrator/components/com_finder/Helper/FinderHelper.php
+++ b/administrator/components/com_finder/Helper/FinderHelper.php
@@ -53,6 +53,11 @@ public static function addSubmenu($vName)
 			'index.php?option=com_finder&view=filters',
 			$vName === 'filters'
 		);
+		\JHtmlSidebar::addEntry(
+			\JText::_('COM_FINDER_SUBMENU_SEARCHES'),
+			'index.php?option=com_finder&view=searches',
+			$vName === 'searches'
+		);
 	}
 
 	/**
diff --git a/administrator/components/com_finder/Model/SearchesModel.php b/administrator/components/com_finder/Model/SearchesModel.php
new file mode 100644
index 0000000000000..05369341a48d2
--- /dev/null
+++ b/administrator/components/com_finder/Model/SearchesModel.php
@@ -0,0 +1,175 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\Component\Finder\Administrator\Model;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+use Joomla\CMS\MVC\Model\ListModel;
+use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\CMS\Plugin\PluginHelper;
+
+/**
+ * Methods supporting a list of search terms.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class SearchesModel extends ListModel
+{
+	/**
+	 * Constructor.
+	 *
+	 * @param   array                $config   An optional associative array of configuration settings.
+	 * @param   MVCFactoryInterface  $factory  The factory.
+	 *
+	 * @see     \Joomla\CMS\MVC\Model\BaseDatabaseModel
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function __construct($config = array(), MVCFactoryInterface $factory = null)
+	{
+		if (empty($config['filter_fields']))
+		{
+			$config['filter_fields'] = array(
+				'search_term', 'a.search_term',
+				'hits', 'a.hits',
+			);
+		}
+
+		parent::__construct($config, $factory);
+	}
+
+	/**
+	 * Method to auto-populate the model state.
+	 *
+	 * Note. Calling getState in this method will result in recursion.
+	 *
+	 * @param   string  $ordering   An optional ordering field.
+	 * @param   string  $direction  An optional direction (asc|desc).
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function populateState($ordering = 'a.hits', $direction = 'asc')
+	{
+		// Special state for toggle results button.
+		$this->setState('show_results', $this->getUserStateFromRequest($this->context . '.show_results', 'show_results', 1, 'int'));
+
+		// Load the parameters.
+		$params = ComponentHelper::getParams('com_finder');
+		$this->setState('params', $params);
+
+		// List state information.
+		parent::populateState($ordering, $direction);
+	}
+
+	/**
+	 * Method to get a store id based on model configuration state.
+	 *
+	 * This is necessary because the model is used by the component and
+	 * different modules that might need different sets of data or different
+	 * ordering requirements.
+	 *
+	 * @param   string  $id  A prefix for the store id.
+	 *
+	 * @return  string  A store id.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getStoreId($id = '')
+	{
+		// Compile the store id.
+		$id .= ':' . $this->getState('show_results');
+		$id .= ':' . $this->getState('filter.search');
+
+		return parent::getStoreId($id);
+	}
+
+	/**
+	 * Build an SQL query to load the list data.
+	 *
+	 * @return  \JDatabaseQuery
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	protected function getListQuery()
+	{
+		// Create a new query object.
+		$db = $this->getDbo();
+		$query = $db->getQuery(true);
+
+		// Select the required fields from the table.
+		$query->select(
+			$this->getState(
+				'list.select',
+				'a.*'
+			)
+		);
+		$query->from($db->quoteName('#__finder_logging', 'a'));
+
+		// Filter by search in title
+		if ($search = $this->getState('filter.search'))
+		{
+			$search = $db->quote('%' . str_replace(' ', '%', $db->escape(trim($search), true) . '%'));
+			$query->where($db->quoteName('a.searchterm') . ' LIKE ' . $search);
+		}
+
+		// Add the list ordering clause.
+		$query->order($db->escape($this->getState('list.ordering', 'a.hits')) . ' ' . $db->escape($this->getState('list.direction', 'ASC')));
+
+		return $query;
+	}
+
+	/**
+	 * Override the parent getItems to inject optional data.
+	 *
+	 * @return  mixed  An array of objects on success, false on failure.
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function getItems()
+	{
+		$items = parent::getItems();
+
+		\JLoader::register('FinderIndexerQuery', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/indexer/query.php');
+		\JLoader::register('FinderIndexerToken', JPATH_COMPONENT_ADMINISTRATOR . '/helpers/indexer/token.php');
+
+		foreach ($items as $item)
+		{
+			$item->query = unserialize($item->query);
+		}
+
+		return $items;
+	}
+
+	/**
+	 * Method to reset the search log table.
+	 *
+	 * @return  boolean
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public function reset()
+	{
+		$db = $this->getDbo();
+
+		try
+		{
+			$db->truncateTable('#__finder_logging');
+		}
+		catch (\RuntimeException $e)
+		{
+			$this->setError($e->getMessage());
+
+			return false;
+		}
+
+		return true;
+	}
+}
diff --git a/administrator/components/com_finder/View/Searches/HtmlView.php b/administrator/components/com_finder/View/Searches/HtmlView.php
new file mode 100644
index 0000000000000..4b578389d7541
--- /dev/null
+++ b/administrator/components/com_finder/View/Searches/HtmlView.php
@@ -0,0 +1,148 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+namespace Joomla\Component\Finder\Administrator\View\Searches;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Helper\ContentHelper;
+use Joomla\CMS\Toolbar\Toolbar;
+use Joomla\CMS\Toolbar\ToolbarHelper;
+use Joomla\Component\Finder\Administrator\Helper\FinderHelper;
+use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
+
+/**
+ * View class for a list of search terms.
+ *
+ * @since  4.0
+ */
+class HtmlView extends BaseHtmlView
+{
+	/**
+	 * True if gathering search statistics is enabled
+	 *
+	 * @var  boolean
+	 */
+	protected $enabled;
+
+	/**
+	 * An array of items
+	 *
+	 * @var  array
+	 */
+	protected $items;
+
+	/**
+	 * The pagination object
+	 *
+	 * @var    \Joomla\CMS\Pagination\Pagination
+	 */
+	protected $pagination;
+
+	/**
+	 * The model state
+	 *
+	 * @var  \JObject
+	 */
+	protected $state;
+
+	/**
+	 * Form object for search filters
+	 *
+	 * @var    \JForm
+	 * @since  4.0.0
+	 */
+	public $filterForm;
+
+	/**
+	 * The active search filters
+	 *
+	 * @var    array
+	 * @since  4.0.0
+	 */
+	public $activeFilters;
+
+	/**
+	 * The actions the user is authorised to perform
+	 *
+	 * @var    \JObject
+	 * @since  4.0.0
+	 */
+	protected $canDo;
+
+	/**
+	 * Display the view.
+	 *
+	 * @param   string  $tpl  The name of the template file to parse; automatically searches through the template paths.
+	 *
+	 * @return  mixed  A string if successful, otherwise an Error object.
+	 */
+	public function display($tpl = null)
+	{
+		$app                 = \JFactory::getApplication();
+		$this->items         = $this->get('Items');
+		$this->pagination    = $this->get('Pagination');
+		$this->state         = $this->get('State');
+		$this->filterForm    = $this->get('FilterForm');
+		$this->activeFilters = $this->get('ActiveFilters');
+		$this->enabled       = $this->state->params->get('logging_enabled');
+		$this->canDo         = ContentHelper::getActions('com_finder');
+
+		// Check for errors.
+		if (count($errors = $this->get('Errors')))
+		{
+			throw new \JViewGenericdataexception(implode("\n", $errors), 500);
+		}
+
+		FinderHelper::addSubmenu('searches');
+
+		// Check if plugin is enabled
+		if ($this->enabled)
+		{
+			$app->enqueueMessage(\JText::_('COM_FINDER_LOGGING_ENABLED'), 'notice');
+		}
+		else
+		{
+			$app->enqueueMessage(\JText::_('COM_FINDER_LOGGING_DISABLED'), 'warning');
+		}
+
+		// Prepare the view.
+		$this->addToolbar();
+		$this->sidebar = \JHtmlSidebar::render();
+
+		return parent::display($tpl);
+	}
+
+	/**
+	 * Add the page title and toolbar.
+	 *
+	 * @return  void
+	 *
+	 * @since   1.6
+	 */
+	protected function addToolbar()
+	{
+		$canDo = $this->canDo;
+
+		ToolbarHelper::title(\JText::_('COM_FINDER_MANAGER_SEARCHES'), 'search');
+
+		if ($canDo->get('core.edit.state'))
+		{
+			ToolbarHelper::custom('searches.reset', 'refresh.png', 'refresh_f2.png', 'JSEARCH_RESET', false);
+		}
+
+		ToolbarHelper::divider();
+
+		if ($canDo->get('core.admin') || $canDo->get('core.options'))
+		{
+			ToolbarHelper::preferences('com_finder');
+		}
+
+		ToolbarHelper::help('JHELP_COMPONENTS_FINDER_MANAGE_SEARCHES');
+	}
+}
diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml
index 351aaebb213cd..d0dff456b8f68 100644
--- a/administrator/components/com_finder/config.xml
+++ b/administrator/components/com_finder/config.xml
@@ -7,7 +7,7 @@
 		>
 
 		<field
-			name="enabled"
+			name="logging_enabled"
 			type="radio"
 			label="COM_FINDER_CONFIG_GATHER_SEARCH_STATISTICS_LABEL"
 			class="switcher"
diff --git a/administrator/components/com_finder/forms/filter_searches.xml b/administrator/components/com_finder/forms/filter_searches.xml
new file mode 100644
index 0000000000000..c3a4c1caf1418
--- /dev/null
+++ b/administrator/components/com_finder/forms/filter_searches.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form>
+	<fields name="filter">
+		<field
+			name="search"
+			type="text"
+			label="COM_FINDER_SEARCH_IN_PHRASE_LABEL"
+			description="COM_FINDER_SEARCH_IN_PHRASE_DESC"
+			hint="JSEARCH_FILTER"
+		/>
+	</fields>
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			onchange="this.form.submit();"
+			default="a.hits ASC"
+			>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.searchterm ASC">COM_FINDER_HEADING_SEARCH_TERM_ASC</option>
+			<option value="a.searchterm DESC">COM_FINDER_HEADING_SEARCH_TERM_DESC</option>
+			<option value="a.hits ASC">JGLOBAL_HITS_ASC</option>
+			<option value="a.hits DESC">JGLOBAL_HITS_DESC</option>
+		</field>
+		<field
+			name="limit"
+			type="limitbox"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
diff --git a/administrator/components/com_finder/sql/install.mysql.sql b/administrator/components/com_finder/sql/install.mysql.sql
index 6df173ecc27d6..792d43c162566 100644
--- a/administrator/components/com_finder/sql/install.mysql.sql
+++ b/administrator/components/com_finder/sql/install.mysql.sql
@@ -66,6 +66,20 @@ CREATE TABLE IF NOT EXISTS `#__finder_links_terms` (
   KEY `idx_link_term_weight` (`link_id`,`term_id`,`weight`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
 
+--
+-- Table structure for table `#__finder_logging`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_logging` (
+  `searchterm` VARCHAR(255) NOT NULL DEFAULT '',
+  `md5sum` VARCHAR(32) NOT NULL DEFAULT '',
+  `query` BLOB NOT NULL,
+  `hits` INT(11) NOT NULL DEFAULT '1',
+  `results` INT(11) NOT NULL DEFAULT '0',
+  UNIQUE INDEX `md5sum` (`md5sum`),
+  INDEX `searchterm` (`searchterm`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
 --
 -- Table structure for table `#__finder_taxonomy`
 --
diff --git a/administrator/components/com_finder/sql/install.postgresql.sql b/administrator/components/com_finder/sql/install.postgresql.sql
index 69db285c6b4b0..086964f903f0f 100644
--- a/administrator/components/com_finder/sql/install.postgresql.sql
+++ b/administrator/components/com_finder/sql/install.postgresql.sql
@@ -63,6 +63,21 @@ CREATE TABLE IF NOT EXISTS "#__finder_links_terms" (
 CREATE INDEX "#__finder_links_terms0_idx_term_weight" on "#__finder_links_terms0" ("term_id", "weight");
 CREATE INDEX "#__finder_links_terms0_idx_link_term_weight" on "#__finder_links_terms0" ("link_id", "term_id", "weight");
 
+--
+-- Table structure for table `#__finder_logging`
+--
+
+CREATE TABLE IF NOT EXISTS "#__finder_logging" (
+  "searchterm" character varying(255) NOT NULL DEFAULT '',
+  "md5sum" character varying(32) NOT NULL DEFAULT '',
+  "query" bytes NOT NULL,
+  "hits" integer NOT NULL DEFAULT 1,
+  "results" integer NOT NULL DEFAULT 0,
+  CONSTRAINT "#__finder_logging_idx_md5sum" UNIQUE ("md5sum")
+);
+CREATE INDEX "#__finder_logging_idx_md5sum" on "#__finder_logging" ("md5sum");
+CREATE INDEX "#__finder_logging_idx_searchterm" on "#__finder_logging" ("searchterm");
+
 --
 -- Table: #__finder_taxonomy
 --
diff --git a/administrator/components/com_finder/sql/uninstall.mysql.sql b/administrator/components/com_finder/sql/uninstall.mysql.sql
index 59d1b7a9b9491..5167421c75378 100644
--- a/administrator/components/com_finder/sql/uninstall.mysql.sql
+++ b/administrator/components/com_finder/sql/uninstall.mysql.sql
@@ -1,6 +1,7 @@
 DROP TABLE IF EXISTS `#__finder_filters`;
 DROP TABLE IF EXISTS `#__finder_links`;
 DROP TABLE IF EXISTS `#__finder_links_terms`;
+DROP TABLE IF EXISTS `#__finder_logging`;
 DROP TABLE IF EXISTS `#__finder_taxonomy`;
 DROP TABLE IF EXISTS `#__finder_taxonomy_map`;
 DROP TABLE IF EXISTS `#__finder_terms`;
diff --git a/administrator/components/com_finder/sql/uninstall.postgresql.sql b/administrator/components/com_finder/sql/uninstall.postgresql.sql
index 6bc222650b261..06507dcd70af5 100644
--- a/administrator/components/com_finder/sql/uninstall.postgresql.sql
+++ b/administrator/components/com_finder/sql/uninstall.postgresql.sql
@@ -1,6 +1,7 @@
 DROP TABLE IF EXISTS "#__finder_filters";
 DROP TABLE IF EXISTS "#__finder_links";
 DROP TABLE IF EXISTS "#__finder_links_terms";
+DROP TABLE IF EXISTS "#__finder_logging";
 DROP TABLE IF EXISTS "#__finder_taxonomy";
 DROP TABLE IF EXISTS "#__finder_taxonomy_map";
 DROP TABLE IF EXISTS "#__finder_terms";
diff --git a/administrator/components/com_finder/tmpl/searches/default.php b/administrator/components/com_finder/tmpl/searches/default.php
new file mode 100644
index 0000000000000..85dae2f684728
--- /dev/null
+++ b/administrator/components/com_finder/tmpl/searches/default.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @package     Joomla.Administrator
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+defined('_JEXEC') or die;
+
+// Include the component HTML helpers.
+JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
+
+JHtml::_('behavior.multiselect');
+
+$listOrder = $this->escape($this->state->get('list.ordering'));
+$listDirn = $this->escape($this->state->get('list.direction'));
+?>
+<form action="<?php echo JRoute::_('index.php?option=com_finder&view=searches'); ?>" method="post" name="adminForm" id="adminForm">
+	<div class="row">
+		<div id="j-sidebar-container" class="col-md-2">
+			<?php echo $this->sidebar; ?>
+		</div>
+		<div class="col-md-10">
+			<div id="j-main-container" class="j-main-container">
+				<?php echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this, 'options' => array('filterButton' => false))); ?>
+				<?php if (empty($this->items)) : ?>
+					<joomla-alert type="warning"><?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?></joomla-alert>
+				<?php else : ?>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th class="nowrap">
+								<?php echo JHtml::_('searchtools.sort', 'COM_FINDER_HEADING_PHRASE', 'a.searchterm', $listDirn, $listOrder); ?>
+							</th>
+							<th style="width:15%" class="nowrap">
+								<?php echo JHtml::_('searchtools.sort', 'JGLOBAL_HITS', 'a.hits', $listDirn, $listOrder); ?>
+							</th>
+							<th style="width:1%" class="nowrap text-center">
+								<?php echo JText::_('COM_FINDER_HEADING_RESULTS'); ?>
+							</th>
+						</tr>
+					</thead>
+					<tfoot>
+						<tr>
+							<td colspan="3">
+								<?php echo $this->pagination->getListFooter(); ?>
+							</td>
+						</tr>
+					</tfoot>
+					<tbody>
+					<?php foreach ($this->items as $i => $item) : ?>
+						<tr class="row<?php echo $i % 2; ?>">
+							<td class="break-word">
+								<?php echo $this->escape($item->searchterm); ?>
+							</td>
+							<td>
+								<?php echo (int) $item->hits; ?>
+							</td>
+							<td class="text-center btns">
+								<?php echo (int) $item->results; ?>
+							</td>
+						</tr>
+					<?php endforeach; ?>
+					</tbody>
+				</table>
+				<?php endif; ?>
+				<input type="hidden" name="task" value="">
+				<input type="hidden" name="boxchecked" value="0">
+				<?php echo JHtml::_('form.token'); ?>
+			</div>
+		</div>
+	</div>
+</form>
diff --git a/administrator/language/en-GB/en-GB.com_finder.ini b/administrator/language/en-GB/en-GB.com_finder.ini
index a27de9f07328d..47fdab65c2a22 100644
--- a/administrator/language/en-GB/en-GB.com_finder.ini
+++ b/administrator/language/en-GB/en-GB.com_finder.ini
@@ -85,6 +85,10 @@ COM_FINDER_HEADING_MAP_COUNT="Map Count"
 COM_FINDER_HEADING_MAP_COUNT_ASC="Map Count ascending"
 COM_FINDER_HEADING_MAP_COUNT_DESC="Map Count descending"
 COM_FINDER_HEADING_NODES="Items"
+COM_FINDER_HEADING_PHRASE="Search Phrase"
+COM_FINDER_HEADING_RESULTS="Results"
+COM_FINDER_HEADING_SEARCH_TERM_ASC="Search Phrase ascending"
+COM_FINDER_HEADING_SEARCH_TERM_DESC="Search Phrase descending"
 COM_FINDER_INDEX="Index"
 COM_FINDER_INDEX_CONFIRM_DELETE_PROMPT="Are you sure you want to delete the selected item(s)?"
 COM_FINDER_INDEX_CONFIRM_PURGE_PROMPT="Are you sure you want to delete ALL items from the index? This can take a long time on large sites."
@@ -126,6 +130,9 @@ COM_FINDER_INDEXER_MESSAGE_OPTIMIZE="The index tables are being optimised for th
 COM_FINDER_INDEXER_MESSAGE_RUNNING="Your content is being indexed. Do not close this window."
 COM_FINDER_ITEM_X_ONLY="%s Only"
 COM_FINDER_ITEMS="Content"
+COM_FINDER_LOGGING_DISABLED="Gathering statistics disabled. Enable it in the Options."
+COM_FINDER_LOGGING_ENABLED="Gathering statistics enabled."
+COM_FINDER_MANAGER_SEARCHES="Search Term Analysis"
 COM_FINDER_MAPS="Maps"
 COM_FINDER_MAPS_CONFIRM_DELETE_PROMPT="Are you sure you want to delete the selected map(s)?"
 COM_FINDER_MAPS_COUNT_PUBLISHED_ITEMS="Published Indexed Content"
@@ -155,6 +162,8 @@ COM_FINDER_QUERY_OPERATOR_AND="And"
 COM_FINDER_QUERY_OPERATOR_NOT="Not"
 COM_FINDER_QUERY_OPERATOR_OR="Or"
 COM_FINDER_SEARCH_FILTER_SEARCH_LABEL="Search Filters"
+COM_FINDER_SEARCH_IN_PHRASE_LABEL="Filter by searched phrase"
+COM_FINDER_SEARCH_IN_PHRASE_DESC="Search for the logged phrase of a search"
 COM_FINDER_SEARCH_LABEL="Search %s:"
 COM_FINDER_SEARCH_SEARCH_QUERY_LABEL="Search Content Maps"
 COM_FINDER_SELECT_SEARCH_FILTER="Select filter"
@@ -167,4 +176,5 @@ COM_FINDER_STATISTICS_TITLE="Smart Search Statistics"
 COM_FINDER_SUBMENU_FILTERS="Search Filters"
 COM_FINDER_SUBMENU_INDEX="Indexed Content"
 COM_FINDER_SUBMENU_MAPS="Content Maps"
+COM_FINDER_SUBMENU_SEARCHES="Statistics"
 COM_FINDER_XML_DESCRIPTION="Smart Search."
diff --git a/components/com_finder/Helper/FinderHelper.php b/components/com_finder/Helper/FinderHelper.php
new file mode 100644
index 0000000000000..568f1174b18d3
--- /dev/null
+++ b/components/com_finder/Helper/FinderHelper.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * @package     Joomla.Site
+ * @subpackage  com_finder
+ *
+ * @copyright   Copyright (C) 2005 - 2018 Open Source Matters, Inc. All rights reserved.
+ * @license     GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace Joomla\Component\Finder\Site\Helper;
+
+defined('JPATH_PLATFORM') or die;
+
+use Joomla\CMS\Component\ComponentHelper;
+
+/**
+ * Helper class for Joomla! Finder components
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class FinderHelper
+{
+	/**
+	 * Method to log searches to the database
+	 *
+	 * @param   FinderIndexerQuery  $searchquery  The search query
+	 * @param   integer             $resultCount  The number of results for this search
+	 *
+	 * @return  void
+	 *
+	 * @since   __DEPLOY_VERSION__
+	 */
+	public static function logSearch(\FinderIndexerQuery $searchquery, $resultCount = 0)
+	{
+		$enable_log_searches = ComponentHelper::getParams('com_finder')->get('logging_enabled', 1);
+
+		if (!$enable_log_searches)
+		{
+			return;
+		}
+
+		if (trim($searchquery->input) == '' && !$searchquery->empty)
+		{
+			return;
+		}
+
+		// Initialise our variables
+		$db = \JFactory::getDbo();
+		$query = $db->getQuery(true);
+
+		// Sanitise the term for the database
+		$temp = unserialize(serialize($searchquery));
+		$temp->input = trim(strtolower($searchquery->input));
+		$entry = new \stdClass;
+		$entry->searchterm = $temp->input;
+		$entry->query = serialize($temp);
+		$entry->md5sum = md5($entry->query);
+		$entry->hits = 1;
+		$entry->results = $resultCount;
+
+		// Query the table to determine if the term has been searched previously
+		$query->select($db->quoteName('hits'))
+			->from($db->quoteName('#__finder_logging'))
+			->where($db->quoteName('md5sum') . ' = ' . $db->quote($entry->md5sum));
+		$db->setQuery($query);
+		$hits = (int) $db->loadResult();
+
+		// Reset the $query object
+		$query->clear();
+
+		// Update the table based on the results
+		if ($hits)
+		{
+			$query->update($db->quoteName('#__finder_logging'))
+				->set('hits = (hits + 1)')
+				->where($db->quoteName('md5sum') . ' = ' . $db->quote($entry->md5sum));
+			$db->setQuery($query);
+			$db->execute();
+		}
+		else
+		{
+			$db->insertObject('#__finder_logging', $entry);
+		}
+	}
+}
diff --git a/components/com_finder/View/Search/HtmlView.php b/components/com_finder/View/Search/HtmlView.php
index 9a16adc6981cd..62b48ae7541da 100644
--- a/components/com_finder/View/Search/HtmlView.php
+++ b/components/com_finder/View/Search/HtmlView.php
@@ -10,7 +10,7 @@
 
 defined('_JEXEC') or die;
 
-use Joomla\CMS\Helper\SearchHelper;
+use Joomla\Component\Finder\Site\Helper\FinderHelper;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Filesystem\Path;
 use Joomla\CMS\Pagination\Pagination;
@@ -168,7 +168,7 @@ public function display($tpl = null)
 		}
 
 		// Log the search
-		SearchHelper::logSearch($this->query->input, 'com_finder');
+		FinderHelper::logSearch($this->query, $this->total);
 
 		// Push out the query data.
 		\JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index be4b8e9a19a07..ef95d538d9e47 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -844,6 +844,22 @@ CREATE TABLE IF NOT EXISTS `#__finder_links_terms` (
 
 -- --------------------------------------------------------
 
+--
+-- Table structure for table `#__finder_logging`
+--
+
+CREATE TABLE IF NOT EXISTS `#__finder_logging` (
+  `searchterm` VARCHAR(255) NOT NULL DEFAULT '',
+  `md5sum` VARCHAR(32) NOT NULL DEFAULT '',
+  `query` BLOB NOT NULL,
+  `hits` INT(11) NOT NULL DEFAULT '1',
+  `results` INT(11) NOT NULL DEFAULT '0',
+  UNIQUE INDEX `md5sum` (`md5sum`),
+  INDEX `searchterm` (`searchterm`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE=utf8mb4_general_ci;
+
+-- --------------------------------------------------------
+
 --
 -- Table structure for table `#__finder_taxonomy`
 --
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index dd27873d2895e..49c687a3a4390 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -845,6 +845,21 @@ CREATE TABLE IF NOT EXISTS "#__finder_links_terms" (
 CREATE INDEX "#__finder_links_terms_idx_term_weight" on "#__finder_links_terms" ("term_id", "weight");
 CREATE INDEX "#__finder_links_terms_idx_link_term_weight" on "#__finder_links_terms" ("link_id", "term_id", "weight");
 
+--
+-- Table structure for table `#__finder_logging`
+--
+
+CREATE TABLE IF NOT EXISTS "#__finder_logging" (
+  "searchterm" character varying(255) NOT NULL DEFAULT '',
+  "md5sum" character varying(32) NOT NULL DEFAULT '',
+  "query" bytes NOT NULL,
+  "hits" integer NOT NULL DEFAULT 1,
+  "results" integer NOT NULL DEFAULT 0,
+  CONSTRAINT "#__finder_logging_idx_md5sum" UNIQUE ("md5sum")
+);
+CREATE INDEX "#__finder_logging_idx_md5sum" on "#__finder_logging" ("md5sum");
+CREATE INDEX "#__finder_logging_idx_searchterm" on "#__finder_logging" ("searchterm");
+
 --
 -- Table structure for table `#__finder_taxonomy`
 --