diff --git a/panels/sort/module.html b/panels/sort/module.html
new file mode 100644
index 00000000000..170d26e8f11
--- /dev/null
+++ b/panels/sort/module.html
@@ -0,0 +1,5 @@
+<div ng-controller='sort'>
+  <h4 ng-hide="_.isUndefined(panel.title)">{{panel.title}}</h4>
+  <select ng-model="panel.sort[0]" ng-options="f for f in fields"></select>
+  <i ng-click="toggle_sort()" ng-class="{'icon-chevron-up': panel.sort[1] == 'asc','icon-chevron-down': panel.sort[1] == 'desc'}"></i>
+</div>
\ No newline at end of file
diff --git a/panels/sort/module.js b/panels/sort/module.js
new file mode 100644
index 00000000000..871728b3375
--- /dev/null
+++ b/panels/sort/module.js
@@ -0,0 +1,24 @@
+angular.module('kibana.sort', [])
+.controller('sort', function($scope, $rootScope) {
+
+  // Set and populate defaults
+  var _d = {
+    query   : "*",
+    size    : 100,
+    sort    : [config.timefield,'desc'],
+  }
+  _.each(_d, function(v, k) {
+    $scope.panel[k] = _.isUndefined($scope.panel[k]) 
+      ? _d[k] : $scope.panel[k];
+  });
+
+  $scope.toggle_sort = function() {
+    $scope.panel.sort[1] = $scope.panel.sort[1] == 'asc' ? 'desc' : 'asc';
+  }
+
+  $scope.fields = [];
+  $scope.$on($scope.panel.group+"-fields", function(event, fields) {
+    $scope.panel.sort = fields.sort;
+    $scope.fields     = _.union(fields.all,$scope.fields);
+  });
+})
\ No newline at end of file