diff --git a/css/glowingbear.css b/css/glowingbear.css
index 335a7e1..c965d8c 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -180,6 +180,7 @@ input[type=text], input[type=password], #sendMessage {
     position: fixed;
     left: 145px; /* sidebar */
     overflow: hidden;
+    width: 100%; /* for title modal click area */
 }
 
 #topbar .actions {
diff --git a/index.html b/index.html
index 0f98a8b..b1146ae 100644
--- a/index.html
+++ b/index.html
@@ -266,9 +266,9 @@ npm run build-electron-{windows, darwin, linux}</pre>
           <button ng-if="debugMode" ng-click="countWatchers()">Count<br />Watchers</button>
         </div>
 
-        <div class="title" title="{{activeBuffer().rtitle}}">
+        <div class="title"  ng-click="showModal('topicModal')">
           <span class="desktop" ng-repeat="part in activeBuffer().title" ng-class="::part.classes" ng-bind-html="::(part.text | linky:'_blank':{rel:'noopener noreferrer'} | DOMfilter:'irclinky')"></span>
-          <span class="mobile" ng-click="showModal('topicModal')" ng-class="{'active': activeBuffer().active, 'channel': activeBuffer().type === 'channel', 'channel_hash': activeBuffer().prefix === '#', 'channel_plus': activeBuffer().prefix === '+', 'channel_ampersand': activeBuffer().prefix === '&'}">{{ activeBuffer().trimmedName || activeBuffer().fullName }}</span>
+          <span class="mobile" ng-class="{'active': activeBuffer().active, 'channel': activeBuffer().type === 'channel', 'channel_hash': activeBuffer().prefix === '#', 'channel_plus': activeBuffer().prefix === '+', 'channel_ampersand': activeBuffer().prefix === '&'}">{{ activeBuffer().trimmedName || activeBuffer().fullName }}</span>
         </div>
 
         <div class="actions pull-right vertical-line-left">
@@ -531,7 +531,7 @@ npm run build-electron-{windows, darwin, linux}</pre>
         <div class="modal-content">
           <div class="modal-header">
             <button type="button" class="close" ng-click="closeModal($event)" aria-hidden="true">&times;</button>
-            <h4 class="modal-title">Channel topic</h4>
+            <h4 class="modal-title">Channel topic {{ activeBuffer().shortName || activeBuffer().fullName }}</h4>
             <p ng-repeat="part in activeBuffer().title" ng-class="::part.classes" ng-bind-html="::(part.text | linky:'_blank':{rel:'noopener noreferrer'} | DOMfilter:'irclinky')"></p>
           </div>
           <div class="modal-footer">