diff --git a/pkg/api/api.go b/pkg/api/api.go
index ea434ed71da..4f4a1ddd72f 100644
--- a/pkg/api/api.go
+++ b/pkg/api/api.go
@@ -68,9 +68,11 @@ func Register(r *macaron.Macaron) {
 	r.Post("/api/user/password/reset", bind(dtos.ResetUserPasswordForm{}), wrap(ResetPassword))
 
 	// dashboard snapshots
-	r.Post("/api/snapshots/", bind(m.CreateDashboardSnapshotCommand{}), CreateDashboardSnapshot)
-	r.Get("/dashboard/snapshot/*", Index)
+  r.Get("/dashboard/snapshot/*", Index)
+  r.Get("/dashboard/snapshots/", reqSignedIn, Index) 
 
+  // api for dashboard snapshots
+  r.Post("/api/snapshots/", bind(m.CreateDashboardSnapshotCommand{}), CreateDashboardSnapshot)
 	r.Get("/api/snapshot/shared-options/", GetSharingOptions)
 	r.Get("/api/snapshots/:key", GetDashboardSnapshot)
 	r.Get("/api/snapshots-delete/:key", DeleteDashboardSnapshot)
@@ -182,6 +184,11 @@ func Register(r *macaron.Macaron) {
 			r.Get("/tags", GetDashboardTags)
 		})
 
+    // dashboard snapshots
+    r.Group("/dashboard/snapshots", func() {
+      r.Get("/", wrap(SearchDashboardSnapshots))
+    })
+
 		// Playlist
 		r.Group("/playlists", func() {
 			r.Get("/", wrap(SearchPlaylists))
diff --git a/pkg/api/dashboard_snapshot.go b/pkg/api/dashboard_snapshot.go
index 521dee29a63..dddb5ed436a 100644
--- a/pkg/api/dashboard_snapshot.go
+++ b/pkg/api/dashboard_snapshot.go
@@ -98,3 +98,25 @@ func DeleteDashboardSnapshot(c *middleware.Context) {
 
 	c.JSON(200, util.DynMap{"message": "Snapshot deleted. It might take an hour before it's cleared from a CDN cache."})
 }
+
+func SearchDashboardSnapshots(c *middleware.Context) Response {
+  query := c.Query("query")
+  limit := c.QueryInt("limit")
+
+  if limit == 0 {
+    limit = 1000
+  }
+
+  searchQuery := m.GetDashboardSnapshotsQuery{
+    Name:  query,
+    Limit: limit,
+    OrgId: c.OrgId,
+  }
+
+  err := bus.Dispatch(&searchQuery)
+  if err != nil {
+    return ApiError(500, "Search failed", err)
+  }
+
+  return Json(200, searchQuery.Result)
+}
diff --git a/pkg/api/index.go b/pkg/api/index.go
index d3bdff12b09..ca2f9320215 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -60,6 +60,12 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 		Url:  "/playlists",
 	})
 
+  data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
+    Text: "Snapshots",
+    Icon: "fa fa-fw fa-camera-retro",
+    Url:  "/dashboard/snapshots",
+  })
+
 	if c.OrgRole == m.ROLE_ADMIN {
 		data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
 			Text: "Data Sources",
diff --git a/pkg/models/dashboard_snapshot.go b/pkg/models/dashboard_snapshot.go
index e8f37e2a236..c9221f42815 100644
--- a/pkg/models/dashboard_snapshot.go
+++ b/pkg/models/dashboard_snapshot.go
@@ -47,3 +47,13 @@ type GetDashboardSnapshotQuery struct {
 
 	Result *DashboardSnapshot
 }
+
+type DashboardSnapshots []*DashboardSnapshot
+
+type GetDashboardSnapshotsQuery struct {
+  Name  string
+  Limit int
+  OrgId int64
+
+  Result DashboardSnapshots
+}
diff --git a/pkg/services/sqlstore/dashboard_snapshot.go b/pkg/services/sqlstore/dashboard_snapshot.go
index f4611050a77..6b71a0e26b3 100644
--- a/pkg/services/sqlstore/dashboard_snapshot.go
+++ b/pkg/services/sqlstore/dashboard_snapshot.go
@@ -12,6 +12,7 @@ func init() {
 	bus.AddHandler("sql", CreateDashboardSnapshot)
 	bus.AddHandler("sql", GetDashboardSnapshot)
 	bus.AddHandler("sql", DeleteDashboardSnapshot)
+  bus.AddHandler("sql", SearchDashboardSnapshots)
 }
 
 func CreateDashboardSnapshot(cmd *m.CreateDashboardSnapshotCommand) error {
@@ -63,3 +64,19 @@ func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error {
 	query.Result = &snapshot
 	return nil
 }
+
+func SearchDashboardSnapshots(query *m.GetDashboardSnapshotsQuery) error {
+  var snapshots = make(m.DashboardSnapshots, 0)
+
+  sess := x.Limit(query.Limit)
+
+  if query.Name != "" {
+    sess.Where("name LIKE ?", query.Name)
+  }
+
+  sess.Where("org_id = ?", query.OrgId)
+  err := sess.Find(&snapshots)
+  query.Result = snapshots
+
+  return err
+}