diff --git a/css/glowingbear.css b/css/glowingbear.css
index 50391c8..19cb22a 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -345,6 +345,10 @@ table.notimestamp td.time {
     display: none !important;
 }
 
+table.notimestampseconds td.time span.seconds {
+    display: none !important;
+}
+
 .modal ul {
     list-style: none;
     padding-left: 15px;
@@ -353,6 +357,9 @@ table.notimestamp td.time {
     font-size: larger;
     margin-bottom: 10px;
 }
+.modal li li {
+    font-size: medium;
+}
 .modal-header {
     border-bottom: 0;
 }
diff --git a/index.html b/index.html
index cb0f9b6..1efe554 100644
--- a/index.html
+++ b/index.html
@@ -231,7 +231,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
             </li>
           </ul>
         </div>
-        <table ng-class="{'notimestamp':!showtimestamp}">
+        <table ng-class="{'notimestamp':!showtimestamp,'notimestampseconds':!showtimestampSeconds}">
           <tbody>
             <tr class="bufferline">
               <td ng-hide="activeBuffer().allLinesFetched" colspan="3">
@@ -244,7 +244,7 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
             <tr class="bufferline">
               <td class="time">
                 <span class="date" bo-class="{'repeated-time': bufferline.shortTime==bufferlines[$index-1].shortTime}">
-                  <span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'HH'"></span><span class="cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters">:</span><span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'mm'"></span>
+                  <span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'HH'"></span><span class="cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters">:</span><span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'mm'"></span><span class="seconds"><span class="cof-chat_time_delimiters cob-chat_time_delimiters coa-chat_time_delimiters">:</span><span class="cof-chat_time cob-chat_time coa-chat_time" bo-text="bufferline.date|date:'ss'"></span></span>
                 </span>
               </td>
               <td class="prefix"><a ng-click="addMention(bufferline.prefix)"><span ng-repeat="part in bufferline.prefix" bo-class="part.classes" bo-html="part.text"></span></a></td>
@@ -295,6 +295,18 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                     </label>
                   </div>
                 </form>
+                <ul ng-show="showtimestamp">
+                  <li>
+                    <form class="form-inline" role="form">
+                      <div class="checkbox">
+                        <label>
+                          <input type="checkbox" ng-model="showtimestampSeconds">
+                          Show seconds
+                        </label>
+                      </div>
+                    </form>
+                  </li>
+                </ul>
               </li>
               <li>
                 <form class="form-inline" role="form">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index b6e0907..ee648c8 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -831,6 +831,8 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     $store.bind($scope, "useFavico", true);
     // Save setting for showtimestamp
     $store.bind($scope, "showtimestamp", showtimestamp);
+    // Save setting for showing seconds on timestamps
+    $store.bind($scope, "showtimestampSeconds", false);
     // Save setting for playing sound on notification
     $store.bind($scope, "soundnotification", false);