diff --git a/artiq/gui/log.py b/artiq/gui/log.py
index a85c9d1c9..abec2280a 100644
--- a/artiq/gui/log.py
+++ b/artiq/gui/log.py
@@ -175,6 +175,10 @@ class LogDock(dockarea.Dock):
         self.log.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
         self.log.horizontalHeader().setResizeMode(
             QtGui.QHeaderView.ResizeToContents)
+        self.log.horizontalHeader().setStretchLastSection(True)
+        self.log.verticalHeader().setResizeMode(
+            QtGui.QHeaderView.ResizeToContents)
+        self.log.verticalHeader().hide()
         self.log.setHorizontalScrollMode(
             QtGui.QAbstractItemView.ScrollPerPixel)
         self.log.setShowGrid(False)
diff --git a/examples/master/repository/arguments_demo.py b/examples/master/repository/arguments_demo.py
index 3bfcde254..a1a903c7a 100644
--- a/examples/master/repository/arguments_demo.py
+++ b/examples/master/repository/arguments_demo.py
@@ -55,6 +55,7 @@ class ArgumentsDemo(EnvExperiment):
     def run(self):
         logging.error("logging test: error")
         logging.warning("logging test: warning")
+        logging.warning("logging test:" + " this is a very long message."*15)
         logging.info("logging test: info")
         logging.debug("logging test: debug")