--- a/src/name/blackcap/clipman/PasteboardQueue.kt	Mon Feb 10 06:55:07 2020 -0700
+++ b/src/name/blackcap/clipman/PasteboardQueue.kt	Mon Feb 10 16:40:09 2020 -0700
@@ -57,10 +57,7 @@
     @Synchronized fun add(item: QueueItem) {
         inSwingThread {
             parent.add(item.view.contents)
-            scrollPane?.run {
-                validate()
-                verticalScrollBar.run { value = maximum + 1 }
-            }
+            validate()
         }
         queue.addLast(item)
         truncate()
@@ -163,7 +160,19 @@
                 size -= 1
             }
             if (dirty) {
-                inSwingThread { parent.validate() }
+                inSwingThread { validate() }
+            }
+        }
+    }
+
+    private fun validate()
+    {
+        if (scrollPane == null) {
+            parent.validate()
+        } else {
+            scrollPane!!.run {
+                validate()
+                verticalScrollBar.run { value = maximum + 1 }
             }
         }
     }