diff --git a/app/assets/stylesheets/admin/components/tooltip.css.scss b/app/assets/stylesheets/admin/components/tooltip.css.scss
new file mode 100644
index 0000000000..7611f2a8ef
--- /dev/null
+++ b/app/assets/stylesheets/admin/components/tooltip.css.scss
@@ -0,0 +1,4 @@
+#powerTip {
+  max-width: 240px;
+  white-space: normal;
+}
diff --git a/app/views/spree/admin/orders/index.html.haml b/app/views/spree/admin/orders/index.html.haml
index b98963513c..b693582db0 100644
--- a/app/views/spree/admin/orders/index.html.haml
+++ b/app/views/spree/admin/orders/index.html.haml
@@ -47,7 +47,7 @@
 
       %th.actions
   %tbody
-    %tr{ng: {repeat: 'order in orders track by $index', class: {even: "'even'", odd: "'odd'"}}, 'ng-class' => "'state-{{order.state}}'"}
+    %tr{ng: {repeat: 'order in orders track by order.id', class: {even: "'even'", odd: "'odd'"}}, 'ng-class' => "'state-{{order.state}}'"}
       %td.align-center
         %input{type: 'checkbox', 'ng-model' => 'checkboxes[order.id]', 'ng-change' => 'toggleSelection(order.id)'}
       %td.align-center