diff --git a/public/app/features/org/OrgPreferences.tsx b/public/app/features/org/OrgPreferences.tsx
index 6116584a34b..4600aeb0a7b 100644
--- a/public/app/features/org/OrgPreferences.tsx
+++ b/public/app/features/org/OrgPreferences.tsx
@@ -2,7 +2,7 @@ import React, { PureComponent } from 'react';
 import { connect } from 'react-redux';
 import { Label } from '../../core/components/Label/Label';
 import SimplePicker from '../../core/components/Picker/SimplePicker';
-import { Dashboard, OrganizationPreferences } from 'app/types';
+import { DashboardSearchHit, OrganizationPreferences } from 'app/types';
 import {
   setOrganizationHomeDashboard,
   setOrganizationTheme,
@@ -12,7 +12,7 @@ import {
 
 export interface Props {
   preferences: OrganizationPreferences;
-  starredDashboards: Dashboard[];
+  starredDashboards: DashboardSearchHit[];
   setOrganizationHomeDashboard: typeof setOrganizationHomeDashboard;
   setOrganizationTheme: typeof setOrganizationTheme;
   setOrganizationTimezone: typeof setOrganizationTimezone;
@@ -69,7 +69,7 @@ export class OrgPreferences extends PureComponent<Props> {
             defaultValue={starredDashboards.find(dashboard => dashboard.id === preferences.homeDashboardId)}
             getOptionValue={i => i.id}
             getOptionLabel={i => i.title}
-            onSelected={(dashboard: Dashboard) => setOrganizationHomeDashboard(dashboard.id)}
+            onSelected={(dashboard: DashboardSearchHit) => setOrganizationHomeDashboard(dashboard.id)}
             options={starredDashboards}
             placeholder="Chose default dashboard"
             width={20}
diff --git a/public/app/features/org/state/actions.ts b/public/app/features/org/state/actions.ts
index 72d6b371060..18ac0cac7ac 100644
--- a/public/app/features/org/state/actions.ts
+++ b/public/app/features/org/state/actions.ts
@@ -1,5 +1,5 @@
 import { ThunkAction } from 'redux-thunk';
-import { Dashboard, Organization, OrganizationPreferences, StoreState } from 'app/types';
+import { DashboardSearchHit, Organization, OrganizationPreferences, StoreState } from 'app/types';
 import { getBackendSrv } from '../../../core/services/backend_srv';
 
 type ThunkResult<R> = ThunkAction<R, StoreState, undefined, any>;
@@ -26,7 +26,7 @@ interface LoadPreferencesAction {
 
 interface LoadStarredDashboardsAction {
   type: ActionTypes.LoadStarredDashboards;
-  payload: Dashboard[];
+  payload: DashboardSearchHit[];
 }
 
 interface SetOrganizationNameAction {
diff --git a/public/app/features/org/state/reducers.ts b/public/app/features/org/state/reducers.ts
index a9a5a597d25..02ffa0d3423 100644
--- a/public/app/features/org/state/reducers.ts
+++ b/public/app/features/org/state/reducers.ts
@@ -1,10 +1,10 @@
-import { Dashboard, Organization, OrganizationPreferences, OrganizationState } from 'app/types';
+import { DashboardSearchHit, Organization, OrganizationPreferences, OrganizationState } from 'app/types';
 import { Action, ActionTypes } from './actions';
 
 const initialState: OrganizationState = {
   organization: {} as Organization,
   preferences: {} as OrganizationPreferences,
-  starredDashboards: [] as Dashboard[],
+  starredDashboards: [] as DashboardSearchHit[],
 };
 
 const organizationReducer = (state = initialState, action: Action): OrganizationState => {
diff --git a/public/app/types/dashboard.ts b/public/app/types/dashboardSearchHit.ts
similarity index 85%
rename from public/app/types/dashboard.ts
rename to public/app/types/dashboardSearchHit.ts
index 338957e56e8..0fca8389e0b 100644
--- a/public/app/types/dashboard.ts
+++ b/public/app/types/dashboardSearchHit.ts
@@ -1,6 +1,6 @@
 import { DashboardAcl } from './acl';
 
-export interface Dashboard {
+export interface DashboardSearchHit {
   id: number;
   tags: string[];
   title: string;
diff --git a/public/app/types/index.ts b/public/app/types/index.ts
index f6b9783df20..7bdf709f023 100644
--- a/public/app/types/index.ts
+++ b/public/app/types/index.ts
@@ -3,7 +3,7 @@ import { AlertRuleDTO, AlertRule, AlertRulesState } from './alerting';
 import { LocationState, LocationUpdate, UrlQueryMap, UrlQueryValue } from './location';
 import { NavModel, NavModelItem, NavIndex } from './navModel';
 import { FolderDTO, FolderState, FolderInfo } from './folders';
-import { Dashboard, DashboardState } from './dashboard';
+import { DashboardSearchHit, DashboardState } from './dashboardSearchHit';
 import { DashboardAcl, OrgRole, PermissionLevel } from './acl';
 import { ApiKey, ApiKeysState, NewApiKey } from './apiKeys';
 import { Invitee, OrgUser, User, UsersState } from './user';
@@ -84,7 +84,7 @@ export {
   AppNotificationsState,
   AppNotificationSeverity,
   AppNotificationTimeout,
-  Dashboard,
+  DashboardSearchHit,
 };
 
 export interface StoreState {
diff --git a/public/app/types/organization.ts b/public/app/types/organization.ts
index a6c537e7f7c..aa7476b361b 100644
--- a/public/app/types/organization.ts
+++ b/public/app/types/organization.ts
@@ -1,4 +1,4 @@
-import { Dashboard } from './dashboard';
+import { DashboardSearchHit } from './dashboardSearchHit';
 
 export interface Organization {
   name: string;
@@ -14,5 +14,5 @@ export interface OrganizationPreferences {
 export interface OrganizationState {
   organization: Organization;
   preferences: OrganizationPreferences;
-  starredDashboards: Dashboard[];
+  starredDashboards: DashboardSearchHit[];
 }