diff --git a/app/models/event_news.rb b/app/models/event_news.rb
index edcc530..8724205 100644
--- a/app/models/event_news.rb
+++ b/app/models/event_news.rb
@@ -6,6 +6,7 @@ class EventNews
   include OrbitModel::Impression
   # encoding: utf-8
   include OrbitTag::Taggable
+  include OrbitHashtag::Hashtaggable
   include OrbitCategory::Categorizable
   include Slug
   require 'event_news_mod/cache'
diff --git a/app/views/admin/event_news/_form.html.erb b/app/views/admin/event_news/_form.html.erb
index dc9af17..dd72530 100644
--- a/app/views/admin/event_news/_form.html.erb
+++ b/app/views/admin/event_news/_form.html.erb
@@ -54,6 +54,7 @@
       <li><a href="#status" data-toggle="tab"><%= t(:status) %></a></li>
     <% end %>
     <li><a href="#tag" data-toggle="tab"><%= t(:tags) %></a></li>
+    <li><a href="#hashtag" data-toggle="tab"><%= t(:hashtags) %></a></li>
     <li><a href="#imageupload" data-toggle="tab"><%= t('event_news.image') %></a></li>
     <li><a href="#carousel_image_upload" data-toggle="tab" title="<%= t('event_news.carousel_image_title') %>"><%= t('event_news.carousel_image') %></a></li>
     <li><a href="#mail-group" data-toggle="tab"><%= t('event_news.email_reminder')%></a></li>    
@@ -275,6 +276,14 @@
       </div>
     </div>
 
+    <!-- Hashtag Module -->
+    <div class="tab-pane fade" id="hashtag">
+      <div class="control-group">
+        <label class="control-label muted"><%= t(:hashtags) %></label>
+        <%= select_hashtags(f, @module_app) %>
+      </div>
+    </div>
+
     <!-- Images Module -->
     <div class="tab-pane fade" id="imageupload">