diff --git a/src/test/unit/web_interface/test_app_add_comment.py b/src/test/unit/web_interface/test_app_add_comment.py
index f0b49e0af..c4deaa8f3 100644
--- a/src/test/unit/web_interface/test_app_add_comment.py
+++ b/src/test/unit/web_interface/test_app_add_comment.py
@@ -11,15 +11,6 @@ def add_comment_to_object(_, comment, author, time):
 
 @pytest.mark.WebInterfaceUnitTestConfig(database_mock_class=DbMock)
 class TestAppAddComment:
-    def test_app_add_comment_get_not_in_db(self, test_client):
-        rv = test_client.get('/comment/abc_123')
-        assert b'Error: UID not found in database' in rv.data
-
-    def test_app_add_comment_get_valid_uid(self, test_client):
-        rv = test_client.get(f'/comment/{TEST_FW.uid}')
-        assert b'Error: UID not found in database' not in rv.data
-        assert b'Add Comment' in rv.data
-
     def test_app_add_comment_put(self, test_client):
         data = {'comment': 'this is the test comment', 'author': 'test author'}
         rv = test_client.post(
diff --git a/src/web_interface/components/miscellaneous_routes.py b/src/web_interface/components/miscellaneous_routes.py
index d552b5bf6..cffa21b08 100644
--- a/src/web_interface/components/miscellaneous_routes.py
+++ b/src/web_interface/components/miscellaneous_routes.py
@@ -57,12 +57,6 @@ def post_comment(self, uid):
         self.db.editing.add_comment_to_object(uid, comment, author, round(time()))
         return redirect(url_for('show_analysis', uid=uid))
 
-    @roles_accepted(*PRIVILEGES['comment'])
-    @AppRoute('/comment/<uid>', GET)
-    def show_add_comment(self, uid):
-        error = not self.db.frontend.exists(uid)
-        return render_template('add_comment.html', uid=uid, error=error)
-
     @roles_accepted(*PRIVILEGES['delete'])
     @AppRoute('/admin/delete_comment/<uid>/<timestamp>', GET)
     def delete_comment(self, uid, timestamp):
diff --git a/src/web_interface/templates/add_comment.html b/src/web_interface/templates/add_comment.html
deleted file mode 100644
index d96886b42..000000000
--- a/src/web_interface/templates/add_comment.html
+++ /dev/null
@@ -1,68 +0,0 @@
-{% extends "base.html" %}
-
-{% set active_page = "Database" %}
-
-
-{% block body %}
-
-
-<div class="row justify-content-center">
-    <div class="col-xl-6 col-lg-8 mt-4">
-
-        <h3 class="mb-3">Add Comment</h3>
-        <h6>for {{ uid | replace_uid_with_hid_link | safe }}</h6>
-        {% if error %}
-            <h3 class="text-danger">Error: UID not found in database</h3>
-        {% endif %}
-    </div>
-</div>
-
-<div class="row justify-content-center">
-    <div class="col-xl-6 col-lg-8 mt-4">
-        <form class="form-horizontal" action="" method=post enctype=multipart/form-data>
-
-            <div class="form-group row">
-                <label class="control-label col-sm-2" for="comment">
-                    Comment:
-                </label>
-                <div class="col-xs-12 col-sm-10">
-                    <textarea name="comment" rows="5" style="resize: vertical; position: relative; z-index: 1;" required autofocus class="form-control" id="comment"></textarea>
-                </div>
-            </div>
-
-            <div class="form-group row">
-                <label class="control-label col-sm-2" for="author">
-                    Author:
-                </label>
-                <div class="col-xs-12 col-sm-10">
-                    <input type="text" name="author" class="form-control" id="author" required style="position: relative; z-index: 1;" value="anonymous">
-                </div>
-            </div>
-
-            {% if current_user.is_authenticated %}
-                <script type="text/javascript">
-                    document.getElementById('author').value = '{{ current_user.email }}';
-                    document.getElementById('author').setAttribute("readonly", true);
-                </script>
-            {% endif %}
-
-            <div class="form-group row">
-                <div class="col-sm-10 offset-sm-2">
-                    <button type="submit" value=submit class="btn btn-primary" id="input_submit"
-                    {% if error %} disabled {% endif %}>
-                        <span class="fas fa-edit"></span> add comment
-                    </button>
-                </div>
-            </div>
-
-            <div class="form-group row">
-                <div class="col-sm-10 offset-sm-2">
-                    <p style="color:grey">Please note: it will take some time before the comment is saved and will show up on the page. Please try reloading the analysis page after a short while.</p>
-                </div>
-            </div>
-
-        </form>
-
-    </div>
-</div>
-{% endblock %}
diff --git a/src/web_interface/templates/show_analysis.html b/src/web_interface/templates/show_analysis.html
index 8e295d20b..c8b245fa4 100644
--- a/src/web_interface/templates/show_analysis.html
+++ b/src/web_interface/templates/show_analysis.html
@@ -381,11 +381,11 @@ <h5 class="modal-title">Add analysis to file</h5>
                         <th>
                             Comments
                             {# Add Comment Button #}
-                            <form action="/comment/{{ firmware.uid }}" style="float: right; margin-right: 5px;">
-                                <button class="btn btn-primary btn-sm" type="submit">
-                                    <i class="far fa-edit"></i> add comment
-                                </button>
-                            </form>
+                            <button class="btn btn-primary btn-sm" type="button" data-toggle="collapse"
+                                    data-target="#addCommentCell" aria-expanded="false" aria-controls="addCommentCell"
+                                    style="float: right;">
+                                <i class="far fa-edit"></i> add comment
+                            </button>
 
                             {# Show Comments Button #}
                             <form onsubmit="return false;" style="float: right; margin-right: 5px;">
@@ -397,6 +397,45 @@ <h5 class="modal-title">Add analysis to file</h5>
                         </th>
                     </tr>
                 </thead>
+                <tbody>
+                    <tr class="collapse" id="addCommentCell">
+                        <td>
+                            <div>
+                                <form class="form-horizontal" id="addCommentForm" action="/comment/{{ uid }}" method=post enctype=multipart/form-data>
+
+                                    <div class="form-group row">
+                                        <label class="control-label col-sm-2" for="comment" style="margin-top: 6px;">
+                                            Comment:
+                                        </label>
+                                        <div class="col-xs-12 col-sm-10">
+                                            <textarea name="comment" rows="5" style="resize: vertical; position: relative; z-index: 1;" required autofocus class="form-control" id="comment"></textarea>
+                                        </div>
+                                    </div>
+
+                                    <div class="form-group row">
+                                        <label class="control-label col-sm-2" for="author" style="margin-top: 6px;">
+                                            Author:
+                                        </label>
+                                        <div class="col-xs-12 col-sm-10">
+                                            <input type="text" name="author" class="form-control" id="author" required
+                                                   style="position: relative; z-index: 1;" value="anonymous">
+                                        </div>
+                                    </div>
+
+                                    {% if current_user.is_authenticated %}
+                                        <script type="text/javascript">
+                                            document.getElementById('author').value = '{{ current_user.email }}';
+                                            document.getElementById('author').setAttribute("readonly", true);
+                                        </script>
+                                    {% endif %}
+                                </form>
+                            </div>
+                            <div>
+                                <button type="submit" class="btn btn-primary" form="addCommentForm">Add Comment</button>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
             </table>
             {% if firmware.comments %}
             <div class="collapse m-0" id="comments">