diff --git a/app/Http/Controllers/CourseController.php b/app/Http/Controllers/CourseController.php
index e08391fbe1e267fc99e5328b62c82f4130acb952..9daab156ebaae8ae2ed5ce0fd3857dd3898bf5ff 100644
--- a/app/Http/Controllers/CourseController.php
+++ b/app/Http/Controllers/CourseController.php
@@ -110,4 +110,13 @@ class CourseController extends Controller
         ]);
         return redirect()->route('home', ['msg' => 3]);
     }
+
+    public function editTopic($id_course, $id_topic, Request $request) {
+        DB::table('topics')->where('id', $id_topic)->update([
+            'name' => $request->topic_name,
+            'description' => $request->topic_description
+        ]);
+
+        return redirect()->route('course', ['id_course' => $id_course, 'msg' => 4]);
+    }
 }
diff --git a/resources/views/course.blade.php b/resources/views/course.blade.php
index b98b2652fea1af39ee4b108b8d2d57b218c44478..c451581f73f09fbb8f6c32e33ef585ba1ea8e3be 100644
--- a/resources/views/course.blade.php
+++ b/resources/views/course.blade.php
@@ -24,6 +24,13 @@
                 <span aria-hidden="true">&times;</span>
             </button>
         </div>
+    @elseif( request()->get('msg') == 4 )
+        <div class="alert alert-success alert-dismissible fade show" role="alert">
+            Deskripsi Materi Berhasil Diubah
+            <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
     @else
         <div class="alert alert-danger alert-dismissible fade show" role="alert">
             Pembuatan Materi Gagal
@@ -55,7 +62,8 @@
                                     {{ $topic->description }} <br/><br/>
                                     @if(Auth::user()->role == 1)
                                         <button type="button" class="btn btn-danger" data-toggle="modal" data-target="#deleteModal{{ $topic->id }}">Hapus</button>
-                                        <a href="<?php echo $topic->id_course; ?>/learn/<?php echo $topic->id; ?>/edit" class="btn btn-primary" role="button">Edit Materi</a>
+                                        <button type="button" class="btn btn-primary" data-toggle="modal" data-target="#editModal{{ $topic->id }}">Edit Deskripsi</button>
+                                        <a style="float: right;" href="<?php echo $topic->id_course; ?>/learn/<?php echo $topic->id; ?>/edit" class="btn btn-primary" role="button">Isi Konten</a>
                                         <div class="modal fade" id="deleteModal{{ $topic->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
                                             <div class="modal-dialog modal-dialog-centered" role="document">
                                                 <div class="modal-content">
@@ -76,6 +84,35 @@
                                                 </div>
                                             </div>
                                         </div>
+                                        <div class="modal fade" id="editModal{{ $topic->id }}" tabindex="-1" role="dialog" aria-labelledby="exampleModalCenterTitle" aria-hidden="true">
+                                            <div class="modal-dialog modal-dialog-centered" role="document">
+                                                <div class="modal-content">
+                                                    <form action="<?php echo Request::url(); ?>/edit_topic/{{ $topic->id }}" method="post">
+                                                        {{ csrf_field() }}
+                                                        <div class="modal-header">
+                                                            <h5 class="modal-title" id="exampleModalCenterTitle">Edit Materi</h5>
+                                                            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                                            <span aria-hidden="true">&times;</span>
+                                                            </button>
+                                                        </div>
+                                                        <div class="modal-body">
+                                                            <div class="form-group">
+                                                                <label for="topic-name" class="col-form-label">Edit Judul Materi</label>
+                                                                <input type="text" class="form-control" name="topic_name" id="topic-name" required="required" value="{{ $topic->name }}">
+                                                            </div>
+                                                            <div class="form-group">
+                                                                <label for="topic-description">Edit Deskripsi</label>
+                                                                <textarea class="form-control" name="topic_description" id="topic_description" rows="2">{{ $topic->description }}</textarea>
+                                                            </div>
+                                                        </div>
+                                                        <div class="modal-footer">
+                                                            <button type="button" class="btn btn-secondary" data-dismiss="modal">Batal</button>
+                                                            <button type="submit" class="btn btn-primary">Submit</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
+                                        </div>
                                     @else
                                         <a href="<?php echo $topic->id_course; ?>/learn/<?php echo $topic->id; ?>" class="btn btn-primary" role="button">Buka Materi</a>
                                     @endif
@@ -127,7 +164,7 @@
                                 <div class="modal-body">
                                     <div class="form-group">
                                         <label for="topic-name" class="col-form-label">Masukkan Judul Materi</label>
-                                        <input type="text" class="form-control" name="topic_name" id="topic-name" required="required" placeholder="Judul Topik">
+                                        <input type="text" class="form-control" name="topic_name" id="topic-name" required="required" placeholder="Judul Materi">
                                     </div>
                                     <div class="form-group">
                                         <label for="topic-description">Deskripsi</label>
diff --git a/routes/web.php b/routes/web.php
index f20f6a6e0e4c45c74fc20c2516a498c403d5743b..b44eee12367db0c4e012211e6c9f55f7d92a6504 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -17,6 +17,7 @@ Route::post('/profile', 'HomeController@profile')->name('profile');
 Route::get('/edit_password', 'HomeController@editPassword')->name('edit_password');
 Route::post('/password', 'HomeController@password')->name('password');
 Route::get('/course/{id_course}', 'CourseController@index')->name('course');
+Route::post('/course/{id_course}/edit_topic/{id_topic}', 'CourseController@editTopic')->name('edit_topic');
 Route::post('/course/new', 'CourseController@new')->name('course/new');
 Route::post('/course/enroll', 'CourseController@enroll')->name('course/enroll');
 Route::post('/course/{id_course}/delete', 'CourseController@delete')->name('course/delete');