diff --git a/app/database/migrations/2015_04_12_172949_add_indexes_to_tagged_items.php b/app/database/migrations/2015_04_12_172949_add_indexes_to_tagged_items.php
new file mode 100644
index 000000000..4ac33f345
--- /dev/null
+++ b/app/database/migrations/2015_04_12_172949_add_indexes_to_tagged_items.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class AddIndexesToTaggedItems extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('tagged_items', function (Blueprint $table) {
+            $table->index('thread_id');
+            $table->index('tag_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('tagged_items', function (Blueprint $table) {
+            $table->dropIndex(['thread_id']);
+            $table->dropIndex(['tag_id']);
+        });
+   }
+}