diff --git a/courses/templates/subject/form_view_teacher.html b/courses/templates/subject/form_view_teacher.html
index 47b8485..2508cca 100644
--- a/courses/templates/subject/form_view_teacher.html
+++ b/courses/templates/subject/form_view_teacher.html
@@ -26,25 +26,6 @@
     </div>
 </div>
 
-<div class="modal fade" id="forumModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-    <div class="modal-dialog" role="document">
-        <div class="modal-content">
-            <div class="modal-header">
-                <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
-            </div>
-            <div class="modal-body">
-                <section>
-                    <div class="forum_topics"></div>
-                </section>
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
-                <button type="button" class="btn btn-primary btn-raised">{% trans 'Save changes' %}</button>
-            </div>
-        </div>
-    </div>
-</div>
-
 <div class="modal fade" id="createForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
     <div class="modal-dialog" role="document">
         <div class="modal-content">
diff --git a/forum/static/js/forum.js b/forum/static/js/forum.js
index 866f03e..51d0069 100644
--- a/forum/static/js/forum.js
+++ b/forum/static/js/forum.js
@@ -89,6 +89,44 @@ function createForum(url, topic) {
 
 /*
 *
+* Function to load edit forum's form and set the submit function
+*
+*/
+function editForum(url, forum) {
+    $.ajax({
+        url: url, 
+        data: {'pk': forum},
+        success: function(data) {
+            $(".forum_form").html(data);
+            //$("#id_topic").val(topic);
+
+            $('.date-picker').datepicker();
+
+            var frm = $('#forum_create');
+            frm.submit(function () {
+                $.ajax({
+                    type: frm.attr('method'),
+                    url: frm.attr('action'),
+                    data: frm.serialize(),
+                    success: function (data) {
+                        $('.forum_view').html(data);
+
+                        $("#editForum").modal('hide');
+                    },
+                    error: function(data) {
+                        $(".forum_form").html(data.responseText);
+                    }
+                });
+                return false;
+            });
+        }
+    });
+
+    $("#editForum").modal();
+}
+
+/*
+*
 * Function to delete a forum
 *
 */
diff --git a/forum/templates/forum/forum_form.html b/forum/templates/forum/forum_form.html
index 5c585e0..dd7fe3d 100644
--- a/forum/templates/forum/forum_form.html
+++ b/forum/templates/forum/forum_form.html
@@ -1,7 +1,7 @@
 {% load static i18n %}
 {% load widget_tweaks %}
 
-<form id="forum_create" method="post" action="{% url 'course:forum:create' %}" enctype="multipart/form-data">
+<form id="forum_create" method="post" action="{% if forum %}{% url 'course:forum:update' forum.id %}{% else %}{% url 'course:forum:create' %}{% endif %}" enctype="multipart/form-data">
 	{% csrf_token %}
 	{% for field in form %}
 		<div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
diff --git a/forum/templates/forum/forum_view.html b/forum/templates/forum/forum_view.html
index 0df7a45..cacae5b 100644
--- a/forum/templates/forum/forum_view.html
+++ b/forum/templates/forum/forum_view.html
@@ -41,7 +41,7 @@
             </div>
             <div class="panel-body">
                 <ul class="nav nav-pills nav-stacked">
-                    <li><a href="javascript:edit_forum('{% url 'course:forum:index' %}', '{{ forum.id }}')">{% trans 'Edit' %}</a></li>
+                    <li><a href="javascript:editForum('{% url 'course:forum:update' forum.id %}', '{{ forum.id }}')">{% trans 'Edit' %}</a></li>
                     <li><a href="javascript:delete_forum('{% url 'course:forum:delete' forum.id %}', '{{ forum.id }}', '{% trans "Are you sure you want to delete this forum?" %}', '{% url 'course:view_subject' forum.topic.subject.slug %}')">{% trans 'Delete' %}</a></li>
                 </ul>
             </div>
@@ -53,7 +53,7 @@
     <div class="row panel panel-default">
         <div class="panel-body">
             <div class="comments-list">
-                <div class="section-heading">
+                <div class="section-heading forum_view">
                     <h1>{{ forum }}</h1>
                     <h4><b>{% trans 'Description' %}:</b> {{ forum.description }}</h4>
                     <h4><b>{% trans 'Opened in' %}:</b> {{ forum.create_date }}</h4>
@@ -103,6 +103,25 @@
             </div>
         </div>
     </div>
+    <!-- Modal to show Forum edit form -->
+    <div class="modal fade" id="editForum" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h4 class="modal-title" id="myModalLabel">{% trans 'Forum' %}</h4>
+                </div>
+                <div class="modal-body">
+                    <section>
+                        <div class="forum_form"></div>
+                    </section>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-danger btn-raised" data-dismiss="modal">{% trans 'Close' %}</button>
+                    <button type="button" onclick="$('#forum_create').submit();" class="btn btn-primary btn-raised">{% trans 'Update' %}</button>
+                </div>
+            </div>
+        </div>
+    </div>
 {% endblock %}
 
 {% block rightbar %}
@@ -114,4 +133,4 @@
 
     </div>
   </div>
-{% endblock rightbar %}
\ No newline at end of file
+{% endblock rightbar %}
diff --git a/forum/templates/forum/render_forum.html b/forum/templates/forum/render_forum.html
new file mode 100644
index 0000000..2281876
--- /dev/null
+++ b/forum/templates/forum/render_forum.html
@@ -0,0 +1,5 @@
+{% load i18n %}
+
+<h1>{{ forum }}</h1>
+<h4><b>{% trans 'Description' %}:</b> {{ forum.description }}</h4>
+<h4><b>{% trans 'Opened in' %}:</b> {{ forum.create_date }}</h4>
\ No newline at end of file
diff --git a/forum/urls.py b/forum/urls.py
index 89e2f57..2924f3c 100644
--- a/forum/urls.py
+++ b/forum/urls.py
@@ -6,8 +6,10 @@ from . import views
 urlpatterns = [
 	url(r'^$', views.ForumIndex.as_view(), name='index'),
 	url(r'^create/$', views.CreateForumView.as_view(), name='create'),
+	url(r'^update/(?P<pk>[\w_-]+)/$', views.UpdateForumView.as_view(), name='update'),
 	url(r'^delete/(?P<pk>[\w_-]+)/$', views.ForumDeleteView.as_view(), name='delete'),
 	url(r'^render_forum/([\w_-]+)/$', views.render_forum, name='render_forum'),
+	url(r'^render_edit_forum/([\w_-]+)/$', views.render_edit_forum, name='render_edit_forum'),
 	url(r'^forum_deleted/$', views.forum_deleted, name='deleted_forum'),
 	url(r'^create_post/$', views.CreatePostView.as_view(), name='create_post'),
 	url(r'^update_post/(?P<pk>[\w_-]+)/$', views.PostUpdateView.as_view(), name='update_post'),
diff --git a/forum/views.py b/forum/views.py
index e3f3895..a0cf2a5 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -50,6 +50,30 @@ def render_forum(request, forum):
 
 	return HttpResponse(str(reverse_lazy('course:forum:view', args = (), kwargs = {'slug': last_forum.slug})) + '-' + str(forum) + '-' + str(last_forum.name))
 
+class UpdateForumView(LoginRequiredMixin, generic.UpdateView):
+	login_url = reverse_lazy("core:home")	
+	redirect_field_name = 'next'
+
+	template_name = 'forum/forum_form.html'
+	form_class = ForumForm
+	model = Forum
+	
+	def form_invalid(self, form):
+		return self.render_to_response(self.get_context_data(form = form), status = 400)
+
+	def get_success_url(self):
+		self.success_url = reverse('course:forum:render_edit_forum', args = (self.object.id, ))
+		
+		return self.success_url
+
+def render_edit_forum(request, forum):
+	last_forum = get_object_or_404(Forum, id = forum)
+	context = {
+		'forum': last_forum
+	}
+
+	return render(request, 'forum/render_forum.html', context)
+
 class ForumDeleteView(LoginRequiredMixin, generic.DeleteView):
 	login_url = reverse_lazy("core:home")
 	redirect_field_name = 'next'
--
libgit2 0.21.2