diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
index 8894b0fcc9..382282b92e 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/config/PluginListPanel.java
@@ -76,6 +76,7 @@ class PluginListPanel extends PluginPanel
 	private static final String RUNELITE_GROUP_NAME = RuneLiteConfig.class.getAnnotation(ConfigGroup.class).value();
 	private static final String PINNED_PLUGINS_CONFIG_KEY = "pinnedPlugins";
 	private static final ImmutableList<String> CATEGORY_TAGS = ImmutableList.of(
+		"OpenOSRS",
 		"Combat",
 		"Chat",
 		"Item",
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/neverlogout/NeverLogoutPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/neverlogout/NeverLogoutPlugin.java
new file mode 100644
index 0000000000..0b1bc8804e
--- /dev/null
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/neverlogout/NeverLogoutPlugin.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2018, OpenOSRS <https://github.com/open-osrs>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package net.runelite.client.plugins.neverlogout;
+
+import javax.inject.Inject;
+import net.runelite.api.Client;
+import net.runelite.api.events.GameTick;
+import net.runelite.client.eventbus.Subscribe;
+import net.runelite.client.plugins.Plugin;
+import net.runelite.client.plugins.PluginDescriptor;
+
+@PluginDescriptor(
+	name = "Never Logout",
+	enabledByDefault = false,
+	description = "Overrides the 5 minute AFK logout timer.",
+	tags = {"openosrs", "never log", "idle", "logout", "log", "never"}
+)
+public class NeverLogoutPlugin extends Plugin
+{
+	@Inject
+	private Client client;
+
+	@Subscribe
+	private void onGameTick(GameTick gameTick)
+	{
+		if (client.getKeyboardIdleTicks() > 14900)
+		{
+			client.setKeyboardIdleTicks(0);
+		}
+		if (client.getMouseIdleTicks() > 14900)
+		{
+			client.setMouseIdleTicks(0);
+		}
+	}
+}
\ No newline at end of file